Skip to content

Commit 70efa69

Browse files
ekuhlmann23Erik Kuhlmann Salazar
ekuhlmann23
and
Erik Kuhlmann Salazar
authored
[Hub Generated] Review request for Microsoft.DocumentDB to add version preview/2022-05-15-preview (#19721)
* Port changes from 2022-05-15 to 2022-05-15-preview * Change wording in description of property. Co-authored-by: Erik Kuhlmann Salazar <[email protected]>
1 parent e59b644 commit 70efa69

File tree

4 files changed

+92
-5
lines changed

4 files changed

+92
-5
lines changed

‎specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/cosmos-db.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9465,6 +9465,11 @@
94659465
"conflictResolutionPolicy": {
94669466
"$ref": "#/definitions/ConflictResolutionPolicy",
94679467
"description": "The conflict resolution policy for the graph."
9468+
},
9469+
"analyticalStorageTtl": {
9470+
"type": "integer",
9471+
"format": "int64",
9472+
"description": "Analytical TTL."
94689473
}
94699474
},
94709475
"required": [
@@ -9645,7 +9650,7 @@
96459650
"readOnly": true,
96469651
"type": "string",
96479652
"format": "date-time",
9648-
"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."
9653+
"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."
96499654
}
96509655
}
96519656
},

‎specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/examples/CosmosDBRestorableMongodbResourceList.json‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,35 @@
55
"location": "WestUS",
66
"instanceId": "d9b26648-2f53-4541-b3d8-3044f4f9810d",
77
"restoreLocation": "WestUS",
8-
"restoreTimestampInUtc": "10/13/2020 4:56"
8+
"restoreTimestampInUtc": "06/01/2022 4:56"
99
},
1010
"responses": {
1111
"200": {
1212
"body": {
1313
"value": [
1414
{
15+
"id": "/subscriptions/2296c272-5d55-40d9-bc05-4d56dc2d7588/providers/Microsoft.DocumentDB/locations/westus/restorableDatabaseAccounts/d9b26648-2f53-4541-b3d8-3044f4f9810d/restorablemongodbresources/Database1",
16+
"type": "Microsoft.DocumentDB/locations/restorableDatabaseAccounts/restorablemongodbresources",
17+
"name": "Database1",
1518
"databaseName": "Database1",
1619
"collectionNames": [
1720
"Collection1"
1821
]
1922
},
2023
{
24+
"id": "/subscriptions/2296c272-5d55-40d9-bc05-4d56dc2d7588/providers/Microsoft.DocumentDB/locations/westus/restorableDatabaseAccounts/d9b26648-2f53-4541-b3d8-3044f4f9810d/restorablemongodbresources/Database2",
25+
"type": "Microsoft.DocumentDB/locations/restorableDatabaseAccounts/restorablemongodbresources",
26+
"name": "Database2",
2127
"databaseName": "Database2",
2228
"collectionNames": [
2329
"Collection1",
2430
"Collection2"
2531
]
2632
},
2733
{
34+
"id": "/subscriptions/2296c272-5d55-40d9-bc05-4d56dc2d7588/providers/Microsoft.DocumentDB/locations/westus/restorableDatabaseAccounts/d9b26648-2f53-4541-b3d8-3044f4f9810d/restorablemongodbresources/Database3",
35+
"type": "Microsoft.DocumentDB/locations/restorableDatabaseAccounts/restorablemongodbresources",
36+
"name": "Database3",
2837
"databaseName": "Database3",
2938
"collectionNames": []
3039
}

‎specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/examples/CosmosDBRestorableSqlResourceList.json‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,35 @@
55
"location": "WestUS",
66
"instanceId": "d9b26648-2f53-4541-b3d8-3044f4f9810d",
77
"restoreLocation": "WestUS",
8-
"restoreTimestampInUtc": "10/13/2020 4:56"
8+
"restoreTimestampInUtc": "06/01/2022 4:56"
99
},
1010
"responses": {
1111
"200": {
1212
"body": {
1313
"value": [
1414
{
15+
"id": "/subscriptions/2296c272-5d55-40d9-bc05-4d56dc2d7588/providers/Microsoft.DocumentDB/locations/westus/restorableDatabaseAccounts/d9b26648-2f53-4541-b3d8-3044f4f9810d/restorablesqlresources/Database1",
16+
"type": "Microsoft.DocumentDB/locations/restorableDatabaseAccounts/restorablesqlresources",
17+
"name": "Database1",
1518
"databaseName": "Database1",
1619
"collectionNames": [
1720
"Container1"
1821
]
1922
},
2023
{
24+
"id": "/subscriptions/2296c272-5d55-40d9-bc05-4d56dc2d7588/providers/Microsoft.DocumentDB/locations/westus/restorableDatabaseAccounts/d9b26648-2f53-4541-b3d8-3044f4f9810d/restorablesqlresources/Database2",
25+
"type": "Microsoft.DocumentDB/locations/restorableDatabaseAccounts/restorablesqlresources",
26+
"name": "Database2",
2127
"databaseName": "Database2",
2228
"collectionNames": [
2329
"Container1",
2430
"Container2"
2531
]
2632
},
2733
{
34+
"id": "/subscriptions/2296c272-5d55-40d9-bc05-4d56dc2d7588/providers/Microsoft.DocumentDB/locations/westus/restorableDatabaseAccounts/d9b26648-2f53-4541-b3d8-3044f4f9810d/restorablesqlresources/Database3",
35+
"type": "Microsoft.DocumentDB/locations/restorableDatabaseAccounts/restorablesqlresources",
36+
"name": "Database3",
2837
"databaseName": "Database3",
2938
"collectionNames": []
3039
}

‎specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-05-15-preview/restorable.json‎

Lines changed: 66 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,13 +1252,45 @@
12521252
"readOnly": true,
12531253
"type": "array",
12541254
"items": {
1255-
"$ref": "../../preview/2022-05-15-preview/cosmos-db.json#/definitions/DatabaseRestoreResource"
1255+
"$ref": "#/definitions/RestorableSqlResourcesGetResult"
12561256
},
12571257
"description": "List of restorable SQL resources, including the database and collection names."
12581258
}
12591259
},
12601260
"description": "The List operation response, that contains the restorable SQL resources."
12611261
},
1262+
"RestorableSqlResourcesGetResult": {
1263+
"type": "object",
1264+
"description": "Specific Databases to restore.",
1265+
"properties": {
1266+
"id": {
1267+
"readOnly": true,
1268+
"type": "string",
1269+
"description": "The unique resource identifier of the ARM resource."
1270+
},
1271+
"name": {
1272+
"readOnly": true,
1273+
"type": "string",
1274+
"description": "The name of the ARM resource."
1275+
},
1276+
"type": {
1277+
"readOnly": true,
1278+
"type": "string",
1279+
"description": "The type of Azure resource."
1280+
},
1281+
"databaseName": {
1282+
"type": "string",
1283+
"description": "The name of the database available for restore."
1284+
},
1285+
"collectionNames": {
1286+
"type": "array",
1287+
"description": "The names of the collections available for restore.",
1288+
"items": {
1289+
"$ref": "cosmos-db.json#/definitions/CollectionName"
1290+
}
1291+
}
1292+
}
1293+
},
12621294
"RestorableMongodbDatabasesListResult": {
12631295
"type": "object",
12641296
"properties": {
@@ -1424,13 +1456,45 @@
14241456
"readOnly": true,
14251457
"type": "array",
14261458
"items": {
1427-
"$ref": "../../preview/2022-05-15-preview/cosmos-db.json#/definitions/DatabaseRestoreResource"
1459+
"$ref": "#/definitions/RestorableMongodbResourcesGetResult"
14281460
},
14291461
"description": "List of restorable MongoDB resources, including the database and collection names."
14301462
}
14311463
},
14321464
"description": "The List operation response, that contains the restorable MongoDB resources."
14331465
},
1466+
"RestorableMongodbResourcesGetResult": {
1467+
"type": "object",
1468+
"description": "Specific Databases to restore.",
1469+
"properties": {
1470+
"id": {
1471+
"readOnly": true,
1472+
"type": "string",
1473+
"description": "The unique resource identifier of the ARM resource."
1474+
},
1475+
"name": {
1476+
"readOnly": true,
1477+
"type": "string",
1478+
"description": "The name of the ARM resource."
1479+
},
1480+
"type": {
1481+
"readOnly": true,
1482+
"type": "string",
1483+
"description": "The type of Azure resource."
1484+
},
1485+
"databaseName": {
1486+
"type": "string",
1487+
"description": "The name of the database available for restore."
1488+
},
1489+
"collectionNames": {
1490+
"type": "array",
1491+
"description": "The names of the collections available for restore.",
1492+
"items": {
1493+
"$ref": "cosmos-db.json#/definitions/CollectionName"
1494+
}
1495+
}
1496+
}
1497+
},
14341498
"RestorableGremlinDatabasesListResult": {
14351499
"type": "object",
14361500
"properties": {

0 commit comments

Comments
 (0)