From 950f2d287b0f18ec6d2ce6894e30104ee8b04cec Mon Sep 17 00:00:00 2001 From: Erik Kuhlmann Salazar Date: Tue, 5 Jul 2022 11:04:23 -0600 Subject: [PATCH 1/2] Port changes from 2022-05-15 to 2022-05-15-preview --- .../preview/2022-05-15-preview/cosmos-db.json | 5 ++ ...CosmosDBRestorableMongodbResourceList.json | 11 ++- .../CosmosDBRestorableSqlResourceList.json | 11 ++- .../2022-05-15-preview/restorable.json | 68 ++++++++++++++++++- 4 files changed, 91 insertions(+), 4 deletions(-) diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/cosmos-db.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/cosmos-db.json index ac78313dd48d..baa58fd04443 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/cosmos-db.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/cosmos-db.json @@ -9465,6 +9465,11 @@ "conflictResolutionPolicy": { "$ref": "#/definitions/ConflictResolutionPolicy", "description": "The conflict resolution policy for the graph." + }, + "analyticalStorageTtl": { + "type": "integer", + "format": "int64", + "description": "Analytical TTL." } }, "required": [ diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/examples/CosmosDBRestorableMongodbResourceList.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/examples/CosmosDBRestorableMongodbResourceList.json index 3ab332ff0803..f74c66e5fbbc 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/examples/CosmosDBRestorableMongodbResourceList.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/examples/CosmosDBRestorableMongodbResourceList.json @@ -5,19 +5,25 @@ "location": "WestUS", "instanceId": "d9b26648-2f53-4541-b3d8-3044f4f9810d", "restoreLocation": "WestUS", - "restoreTimestampInUtc": "10/13/2020 4:56" + "restoreTimestampInUtc": "06/01/2022 4:56" }, "responses": { "200": { "body": { "value": [ { + "id": "/subscriptions/2296c272-5d55-40d9-bc05-4d56dc2d7588/providers/Microsoft.DocumentDB/locations/westus/restorableDatabaseAccounts/d9b26648-2f53-4541-b3d8-3044f4f9810d/restorablemongodbresources/Database1", + "type": "Microsoft.DocumentDB/locations/restorableDatabaseAccounts/restorablemongodbresources", + "name": "Database1", "databaseName": "Database1", "collectionNames": [ "Collection1" ] }, { + "id": "/subscriptions/2296c272-5d55-40d9-bc05-4d56dc2d7588/providers/Microsoft.DocumentDB/locations/westus/restorableDatabaseAccounts/d9b26648-2f53-4541-b3d8-3044f4f9810d/restorablemongodbresources/Database2", + "type": "Microsoft.DocumentDB/locations/restorableDatabaseAccounts/restorablemongodbresources", + "name": "Database2", "databaseName": "Database2", "collectionNames": [ "Collection1", @@ -25,6 +31,9 @@ ] }, { + "id": "/subscriptions/2296c272-5d55-40d9-bc05-4d56dc2d7588/providers/Microsoft.DocumentDB/locations/westus/restorableDatabaseAccounts/d9b26648-2f53-4541-b3d8-3044f4f9810d/restorablemongodbresources/Database3", + "type": "Microsoft.DocumentDB/locations/restorableDatabaseAccounts/restorablemongodbresources", + "name": "Database3", "databaseName": "Database3", "collectionNames": [] } diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/examples/CosmosDBRestorableSqlResourceList.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/examples/CosmosDBRestorableSqlResourceList.json index 1f2264cab4c4..7f7db1ce8876 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/examples/CosmosDBRestorableSqlResourceList.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/examples/CosmosDBRestorableSqlResourceList.json @@ -5,19 +5,25 @@ "location": "WestUS", "instanceId": "d9b26648-2f53-4541-b3d8-3044f4f9810d", "restoreLocation": "WestUS", - "restoreTimestampInUtc": "10/13/2020 4:56" + "restoreTimestampInUtc": "06/01/2022 4:56" }, "responses": { "200": { "body": { "value": [ { + "id": "/subscriptions/2296c272-5d55-40d9-bc05-4d56dc2d7588/providers/Microsoft.DocumentDB/locations/westus/restorableDatabaseAccounts/d9b26648-2f53-4541-b3d8-3044f4f9810d/restorablesqlresources/Database1", + "type": "Microsoft.DocumentDB/locations/restorableDatabaseAccounts/restorablesqlresources", + "name": "Database1", "databaseName": "Database1", "collectionNames": [ "Container1" ] }, { + "id": "/subscriptions/2296c272-5d55-40d9-bc05-4d56dc2d7588/providers/Microsoft.DocumentDB/locations/westus/restorableDatabaseAccounts/d9b26648-2f53-4541-b3d8-3044f4f9810d/restorablesqlresources/Database2", + "type": "Microsoft.DocumentDB/locations/restorableDatabaseAccounts/restorablesqlresources", + "name": "Database2", "databaseName": "Database2", "collectionNames": [ "Container1", @@ -25,6 +31,9 @@ ] }, { + "id": "/subscriptions/2296c272-5d55-40d9-bc05-4d56dc2d7588/providers/Microsoft.DocumentDB/locations/westus/restorableDatabaseAccounts/d9b26648-2f53-4541-b3d8-3044f4f9810d/restorablesqlresources/Database3", + "type": "Microsoft.DocumentDB/locations/restorableDatabaseAccounts/restorablesqlresources", + "name": "Database3", "databaseName": "Database3", "collectionNames": [] } diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/restorable.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/restorable.json index fa0721827e09..8e76ce2358f0 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/restorable.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/restorable.json @@ -1252,13 +1252,45 @@ "readOnly": true, "type": "array", "items": { - "$ref": "../../preview/2022-05-15-preview/cosmos-db.json#/definitions/DatabaseRestoreResource" + "$ref": "#/definitions/RestorableSqlResourcesGetResult" }, "description": "List of restorable SQL resources, including the database and collection names." } }, "description": "The List operation response, that contains the restorable SQL resources." }, + "RestorableSqlResourcesGetResult": { + "type": "object", + "description": "Specific Databases to restore.", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "The unique resource identifier of the ARM resource." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The name of the ARM resource." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "The type of Azure resource." + }, + "databaseName": { + "type": "string", + "description": "The name of the database available for restore." + }, + "collectionNames": { + "type": "array", + "description": "The names of the collections available for restore.", + "items": { + "$ref": "cosmos-db.json#/definitions/CollectionName" + } + } + } + }, "RestorableMongodbDatabasesListResult": { "type": "object", "properties": { @@ -1424,13 +1456,45 @@ "readOnly": true, "type": "array", "items": { - "$ref": "../../preview/2022-05-15-preview/cosmos-db.json#/definitions/DatabaseRestoreResource" + "$ref": "#/definitions/RestorableMongodbResourcesGetResult" }, "description": "List of restorable MongoDB resources, including the database and collection names." } }, "description": "The List operation response, that contains the restorable MongoDB resources." }, + "RestorableMongodbResourcesGetResult": { + "type": "object", + "description": "Specific Databases to restore.", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "The unique resource identifier of the ARM resource." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The name of the ARM resource." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "The type of Azure resource." + }, + "databaseName": { + "type": "string", + "description": "The name of the database available for restore." + }, + "collectionNames": { + "type": "array", + "description": "The names of the collections available for restore.", + "items": { + "$ref": "cosmos-db.json#/definitions/CollectionName" + } + } + } + }, "RestorableGremlinDatabasesListResult": { "type": "object", "properties": { From d142ff69b9612d9581ecaa654b1d42b5ca133292 Mon Sep 17 00:00:00 2001 From: Erik Kuhlmann Salazar Date: Tue, 5 Jul 2022 11:19:07 -0600 Subject: [PATCH 2/2] Change wording in description of property. --- .../preview/2022-05-15-preview/cosmos-db.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/cosmos-db.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/cosmos-db.json index baa58fd04443..a8e115c85703 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/cosmos-db.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/cosmos-db.json @@ -9650,7 +9650,7 @@ "readOnly": true, "type": "string", "format": "date-time", - "description": "Generation time in UTC of the key in ISO-8601 format. A value of null means that the last key regeneration was triggered before 2022-06-18." + "description": "Generation time in UTC of the key in ISO-8601 format. If the value is missing from the object, it means that the last key regeneration was triggered before 2022-06-18." } } },