Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CosmosDB Restoreable APIs for SQL and MongoDB database account #11428

Merged
merged 24 commits into from
Dec 11, 2020
Merged

CosmosDB Restoreable APIs for SQL and MongoDB database account #11428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
3ab01d9
adding new restorable apis
vinhms Oct 28, 2020
dea7e44
fix some typos
vinhms Oct 28, 2020
ec60ddc
fix validations
vinhms Oct 28, 2020
a0dc570
fix more validations
vinhms Oct 28, 2020
b2e1a82
prettier
vinhms Oct 28, 2020
9f32da4
fix name and add apitype
vinhms Oct 29, 2020
9ad2675
fix casing
vinhms Oct 29, 2020
1d9738e
add custom word etcd
vinhms Oct 29, 2020
32a825a
add mongodb
vinhms Nov 2, 2020
dd8ddcd
fix prameter name
vinhms Nov 2, 2020
85e3723
fix validations
vinhms Nov 2, 2020
bea1863
make read only
vinhms Nov 4, 2020
022fd14
remove the word snapshot and make properties readonly
vinhms Nov 4, 2020
941fc50
pretty
vinhms Nov 4, 2020
755bc39
improved some descriptions
vinhms Nov 6, 2020
647ac36
update description and removed mongodb content
vinhms Nov 16, 2020
a4a6c5b
fix container property name
vinhms Nov 16, 2020
d05e1ab
fix documentcollection name
vinhms Nov 16, 2020
ad607da
make query parameter optional
vinhms Nov 17, 2020
6b8e7b9
address Meha's comments
vinhms Dec 1, 2020
0b357ed
move restorable apis to separate file
vinhms Dec 1, 2020
190d84e
move restorable database apis back to cosmos-db.json
vinhms Dec 1, 2020
f16443e
remove point read apis
vinhms Dec 1, 2020
3ccbd3f
fix avocado
vinhms Dec 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 62 additions & 3 deletions ...cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7695,7 +7695,7 @@
},
"databasesToRestore": {
"type": "array",
"description": "List of specific databases to restore.",
"description": "List of specific databases available for restore.",
"items": {
"$ref": "#/definitions/DatabaseRestoreResource"
}
Expand All @@ -7708,11 +7708,11 @@
"properties": {
"databaseName": {
"type": "string",
"description": "The name of the database to restore."
"description": "The name of the database available for restore."
},
"collectionNames": {
"type": "array",
"description": "The names of the collections to restore.",
"description": "The names of the collections available for restore.",
"items": {
"$ref": "#/definitions/CollectionName"
}
Expand Down Expand Up @@ -7837,6 +7837,65 @@
"type": "string",
"format": "date-time",
"description": "The time at which the restorable database account has been deleted (ISO-8601 format)."
},
"apiType": {
"type": "string",
"readOnly": true,
"description": "The API type of the restorable database account.",
"$ref": "#/definitions/ApiType"
},
"restorableLocations": {
"type": "array",
"readOnly": true,
"description": "List of regions where the of the database account can be restored from.",
"items": {
"$ref": "#/definitions/RestorableLocationResource"
}
}
}
},
"ApiType": {
"description": "Enum to indicate the API type of the restorable database account.",
"type": "string",
"readOnly": true,
"enum": [
"MongoDB",
"Gremlin",
"Cassandra",
"Table",
"Sql",
"GremlinV2"
],
"x-ms-enum": {
"name": "ApiType",
"modelAsString": true
}
},
"RestorableLocationResource": {
"type": "object",
"description": "Properties of the regional restorable account.",
"properties": {
"locationName": {
"type": "string",
"readOnly": true,
"description": "The location of the regional restorable account."
},
"regionalDatabaseAccountInstanceId": {
"type": "string",
"readOnly": true,
"description": "The instance id of the regional restorable account."
},
"creationTime": {
"type": "string",
"readOnly": true,
"format": "date-time",
"description": "The creation time of the regional restorable database account (ISO-8601 format)."
},
"deletionTime": {
"type": "string",
"readOnly": true,
"format": "date-time",
"description": "The time at which the regional restorable database account has been deleted (ISO-8601 format)."
}
}
}
Expand Down
16 changes: 15 additions & 1 deletion ....DocumentDB/preview/2020-06-01-preview/examples/CosmosDBRestorableDatabaseAccountGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,21 @@
"properties": {
"accountName": "ddb1",
"creationTime": "2020-04-11T21:56:15Z",
"deletionTime": "2020-06-12T22:05:09Z"
"deletionTime": "2020-06-12T22:05:09Z",
"apiType": "Sql",
"restorableLocations": [
{
"locationName": "South Central US",
"regionalDatabaseAccountInstanceId": "d7a01f78-606f-45c6-9dac-0df32f433bb5",
"creationTime": "2020-10-30T21:13:10.7486417Z",
"deletionTime": "2020-10-30T21:13:35.4466333Z"
},
{
"locationName": "West US",
"regionalDatabaseAccountInstanceId": "fdb43d84-1572-4697-b6e7-2bcda0c51b2c",
"creationTime": "2020-10-30T21:13:10.7486417Z"
}
]
}
}
}
Expand Down
32 changes: 30 additions & 2 deletions ...DocumentDB/preview/2020-06-01-preview/examples/CosmosDBRestorableDatabaseAccountList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,21 @@
"properties": {
"accountName": "ddb1",
"creationTime": "2020-04-11T21:56:15Z",
"deletionTime": "2020-06-12T22:05:09Z"
"deletionTime": "2020-06-12T22:05:09Z",
"apiType": "Sql",
"restorableLocations": [
{
"locationName": "South Central US",
"regionalDatabaseAccountInstanceId": "d7a01f78-606f-45c6-9dac-0df32f433bb5",
"creationTime": "2020-10-30T21:13:10.7486417Z",
"deletionTime": "2020-10-30T21:13:35.4466333Z"
},
{
"locationName": "West US",
"regionalDatabaseAccountInstanceId": "fdb43d84-1572-4697-b6e7-2bcda0c51b2c",
"creationTime": "2020-10-30T21:13:10.7486417Z"
}
]
}
},
{
Expand All @@ -26,7 +40,21 @@
"type": "Microsoft.DocumentDB/locations/restorableDatabaseAccounts",
"properties": {
"accountName": "ddb2",
"creationTime": "2020-05-01T08:05:18Z"
"creationTime": "2020-05-01T08:05:18Z",
"apiType": "Sql",
"restorableLocations": [
{
"locationName": "South Central US",
"regionalDatabaseAccountInstanceId": "d7a01f78-606f-45c6-9dac-0df32f433bb5",
"creationTime": "2020-10-30T21:13:10.7486417Z",
"deletionTime": "2020-10-30T21:13:35.4466333Z"
},
{
"locationName": "West US",
"regionalDatabaseAccountInstanceId": "fdb43d84-1572-4697-b6e7-2bcda0c51b2c",
"creationTime": "2020-10-30T21:13:10.7486417Z"
}
]
}
}
]
Expand Down
32 changes: 30 additions & 2 deletions .../preview/2020-06-01-preview/examples/CosmosDBRestorableDatabaseAccountNoLocationList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,21 @@
"properties": {
"accountName": "ddb1",
"creationTime": "2020-04-11T21:56:15Z",
"deletionTime": "2020-06-12T22:05:09Z"
"deletionTime": "2020-06-12T22:05:09Z",
"apiType": "Sql",
"restorableLocations": [
{
"locationName": "South Central US",
"regionalDatabaseAccountInstanceId": "d7a01f78-606f-45c6-9dac-0df32f433bb5",
"creationTime": "2020-10-30T21:13:10.7486417Z",
"deletionTime": "2020-10-30T21:13:35.4466333Z"
},
{
"locationName": "West US",
"regionalDatabaseAccountInstanceId": "fdb43d84-1572-4697-b6e7-2bcda0c51b2c",
"creationTime": "2020-10-30T21:13:10.7486417Z"
}
]
}
},
{
Expand All @@ -25,7 +39,21 @@
"type": "Microsoft.DocumentDB/locations/restorableDatabaseAccounts",
"properties": {
"accountName": "ddb2",
"creationTime": "2020-05-01T08:05:18Z"
"creationTime": "2020-05-01T08:05:18Z",
"apiType": "Sql",
"restorableLocations": [
{
"locationName": "South Central US",
"regionalDatabaseAccountInstanceId": "d7a01f78-606f-45c6-9dac-0df32f433bb5",
"creationTime": "2020-10-30T21:13:10.7486417Z",
"deletionTime": "2020-10-30T21:13:35.4466333Z"
},
{
"locationName": "West US",
"regionalDatabaseAccountInstanceId": "fdb43d84-1572-4697-b6e7-2bcda0c51b2c",
"creationTime": "2020-10-30T21:13:10.7486417Z"
}
]
}
}
]
Expand Down
31 changes: 31 additions & 0 deletions ...cumentDB/preview/2020-06-01-preview/examples/CosmosDBRestorableMongodbCollectionList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"parameters": {
"api-version": "2020-06-01-preview",
"subscriptionId": "subid",
"location": "WestUS",
"instanceId": "98a570f2-63db-4117-91f0-366327b7b353",
"restorableMongodbDatabaseRid": "PD5DALigDgw="
MehaKaushik marked this conversation as resolved.
Show resolved Hide resolved
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/subid/providers/Microsoft.DocumentDb/locations/westus/restorableDatabaseAccounts/98a570f2-63db-4117-91f0-366327b7b353/restorableMongodbCollections/79609a98-3394-41f8-911f-cfab0c075c86",
"type": "Microsoft.DocumentDB/locations/restorableDatabaseAccounts/restorableMongodbCollections",
"name": "79609a98-3394-41f8-911f-cfab0c075c86",
"properties": {
"resource": {
"_rid": "zAyAPQAAAA==",
"eventTimestamp": "2020-10-13T04:56:42Z",
"ownerId": "Collection1",
"ownerResourceId": "V18LoLrv-qA=",
"operationType": "Create"
}
vinhms marked this conversation as resolved.
Show resolved Hide resolved
}
}
]
}
}
}
}
44 changes: 44 additions & 0 deletions ...DocumentDB/preview/2020-06-01-preview/examples/CosmosDBRestorableMongodbDatabaseList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"parameters": {
"api-version": "2020-06-01-preview",
"subscriptionId": "2296c272-5d55-40d9-bc05-4d56dc2d7588",
"location": "WestUS",
"instanceId": "d9b26648-2f53-4541-b3d8-3044f4f9810d"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/2296c272-5d55-40d9-bc05-4d56dc2d7588/providers/Microsoft.DocumentDb/locations/westus/restorableDatabaseAccounts/36f09704-6be3-4f33-aa05-17b73e504c75/restorableMongodbDatabases/59c21367-b98b-4a8e-abb7-b6f46600decc",
"type": "Microsoft.DocumentDB/locations/restorableDatabaseAccounts/restorableMongodbDatabases",
"name": "59c21367-b98b-4a8e-abb7-b6f46600decc",
"properties": {
"resource": {
"_rid": "DLB14gAAAA==",
"eventTimestamp": "2020-09-02T19:45:03Z",
"ownerId": "Database1",
"ownerResourceId": "PD5DALigDgw=",
"operationType": "Create"
}
}
},
{
"id": "/subscriptions/2296c272-5d55-40d9-bc05-4d56dc2d7588/providers/Microsoft.DocumentDb/locations/westus/restorableDatabaseAccounts/d9b26648-2f53-4541-b3d8-3044f4f9810d/restorableMongodbDatabases/8456cb17-cdb0-4c6a-8db8-d0ff3f886257",
"type": "Microsoft.DocumentDB/locations/restorableDatabaseAccounts/restorableMongodbDatabases",
"name": "8456cb17-cdb0-4c6a-8db8-d0ff3f886257",
"properties": {
"resource": {
"_rid": "ESXNLAAAAA==",
"eventTimestamp": "2020-09-02T19:53:42Z",
"ownerId": "Database1",
"ownerResourceId": "PD5DALigDgw=",
"operationType": "Delete"
}
}
}
]
}
}
}
}
35 changes: 35 additions & 0 deletions ...DocumentDB/preview/2020-06-01-preview/examples/CosmosDBRestorableMongodbResourceList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parameters": {
"api-version": "2020-06-01-preview",
"subscriptionId": "2296c272-5d55-40d9-bc05-4d56dc2d7588",
"location": "WestUS",
"instanceId": "d9b26648-2f53-4541-b3d8-3044f4f9810d",
"restoreLocation": "WestUS",
"restoreTimestampInUtc": "10/13/2020 4:56"
},
"responses": {
"200": {
"body": {
"value": [
{
"databaseName": "Database1",
"collectionNames": [
"Collection1"
]
},
{
"databaseName": "Database2",
"collectionNames": [
"Collection1",
"Collection2"
]
},
{
"databaseName": "Database3",
"collectionNames": []
}
]
}
}
}
}
Loading