Merge pull request #6 from MehaKaushik/master

importing changes missed from old versions
amisi01 · Apr 15, 2021 · 086ee33 · 086ee33
2 parents da5099c + 78e53e1
commit 086ee33
Show file tree

Hide file tree

Showing 7 changed files with 216 additions and 1 deletion.
diff --git a/...cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-04-01-preview/cosmos-db.json b/...cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-04-01-preview/cosmos-db.json
@@ -5112,6 +5112,78 @@
         }
       }
     },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.DocumentDB/locations": {
+      "get": {
+        "operationId": "LocationList",
+        "x-ms-examples": {
+          "CosmosDBLocationList": {
+            "$ref": "./examples/CosmosDBLocationList.json"
+          }
+        },
+        "description": "List Cosmos DB locations and their properties",
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The operation completed successfully.",
+            "schema": {
+              "$ref": "#/definitions/LocationListResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/CloudError"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.DocumentDB/locations/{location}": {
+      "get": {
+        "operationId": "LocationGet",
+        "x-ms-examples": {
+          "CosmosDBLocationGet": {
+            "$ref": "./examples/CosmosDBLocationGet.json"
+          }
+        },
+        "description": "Get the properties of an existing Cosmos DB location",
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/locationParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The Cosmos DB location properties were retrieved successfully.",
+            "schema": {
+              "$ref": "#/definitions/LocationGetResult"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/CloudError"
+            }
+          }
+        }
+      }
+    },
     "/subscriptions/{subscriptionId}/providers/Microsoft.DocumentDB/locations/{location}/restorableDatabaseAccounts/{instanceId}": {
       "get": {
         "operationId": "RestorableDatabaseAccounts_GetByLocation",
@@ -6252,6 +6324,10 @@
           "description": "The URI of the key vault",
           "type": "string"
         },
+        "defaultIdentity": {
+          "description": "The default identity for accessing key vault used in features like customer managed keys. The default identity needs to be explicitly set by the users. It can be \"FirstPartyIdentity\", \"SystemAssignedIdentity\" and more.",
+          "type": "string"
+        },
         "publicNetworkAccess": {
           "description": "Whether requests from Public Network are allowed",
           "$ref": "#/definitions/PublicNetworkAccess"
@@ -6376,6 +6452,10 @@
           "description": "The URI of the key vault",
           "type": "string"
         },
+        "defaultIdentity": {
+          "description": "The default identity for accessing key vault used in features like customer managed keys. The default identity needs to be explicitly set by the users. It can be \"FirstPartyIdentity\", \"SystemAssignedIdentity\" and more.",
+          "type": "string"
+        },
         "publicNetworkAccess": {
           "description": "Whether requests from Public Network are allowed",
           "$ref": "#/definitions/PublicNetworkAccess"
@@ -6546,6 +6626,10 @@
           "description": "The URI of the key vault",
           "type": "string"
         },
+        "defaultIdentity": {
+          "description": "The default identity for accessing key vault used in features like customer managed keys. The default identity needs to be explicitly set by the users. It can be \"FirstPartyIdentity\", \"SystemAssignedIdentity\" and more.",
+          "type": "string"
+        },
         "publicNetworkAccess": {
           "description": "Whether requests from Public Network are allowed",
           "$ref": "#/definitions/PublicNetworkAccess"
@@ -8519,7 +8603,6 @@
     },
     "PublicNetworkAccess": {
       "type": "string",
-      "readOnly": true,
       "description": "Whether requests from Public Network are allowed",
       "enum": [
         "Enabled",
@@ -8773,6 +8856,64 @@
         }
       }
     },
+    "LocationListResult": {
+      "properties": {
+        "value": {
+          "readOnly": true,
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/LocationGetResult"
+          },
+          "description": "List of Cosmos DB locations and their properties."
+        }
+      },
+      "description": "The List operation response, that contains Cosmos DB locations and their properties."
+    },
+    "LocationGetResult": {
+      "description": "Cosmos DB location get result",
+      "type": "object",
+      "properties": {
+        "properties": {
+          "type": "object",
+          "description": "Cosmos DB location metadata",
+          "$ref": "#/definitions/LocationProperties"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/ARMProxyResource"
+        }
+      ]
+    },
+    "LocationProperties": {
+      "description": "Cosmos DB location metadata",
+      "type": "object",
+      "properties": {
+        "status": {
+          "type": "string",
+          "readOnly": true,
+          "description": "The current status of location in Azure."
+        },
+        "supportsAvailabilityZone": {
+          "type": "boolean",
+          "readOnly": true,
+          "description": "Flag indicating whether the location supports availability zones or not."
+        },
+        "isResidencyRestricted": {
+          "type": "boolean",
+          "readOnly": true,
+          "description": "Flag indicating whether the location is residency sensitive."
+        },
+        "backupStorageRedundancies": {
+          "readOnly": true,
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BackupStorageRedundancy"
+          },
+          "description": "The properties of available backup storage redundancies."
+        }
+      }
+    },
     "ApiType": {
       "description": "Enum to indicate the API type of the restorable database account.",
       "type": "string",

diff --git a/...soft.DocumentDB/preview/2021-04-01-preview/examples/CosmosDBDatabaseAccountCreateMax.json b/...soft.DocumentDB/preview/2021-04-01-preview/examples/CosmosDBDatabaseAccountCreateMax.json
@@ -54,6 +54,8 @@
         "apiProperties": {
           "serverVersion": "3.2"
         },
+        "publicNetworkAccess": "Enabled",
+        "defaultIdentity": "FirstPartyIdentity",
         "enableAnalyticalStorage": true,
         "backupPolicy": {
           "type": "Periodic",
@@ -173,6 +175,8 @@
             "serverVersion": "3.2"
           },
           "enableAnalyticalStorage": true,
+          "publicNetworkAccess": "Enabled",
+          "defaultIdentity": "FirstPartyIdentity",
           "instanceId": "d9b26648-2f53-4541-b3d8-3044f4f9810d",
           "createMode": "Default",
           "backupPolicy": {

diff --git a/.../Microsoft.DocumentDB/preview/2021-04-01-preview/examples/CosmosDBDatabaseAccountGet.json b/.../Microsoft.DocumentDB/preview/2021-04-01-preview/examples/CosmosDBDatabaseAccountGet.json
@@ -79,6 +79,7 @@
           "enableFreeTier": false,
           "apiProperties": {},
           "enableAnalyticalStorage": true,
+          "defaultIdentity": "FirstPartyIdentity",
           "instanceId": "d9b26648-2f53-4541-b3d8-3044f4f9810d",
           "createMode": "Default",
           "backupPolicy": {

diff --git a/...Microsoft.DocumentDB/preview/2021-04-01-preview/examples/CosmosDBDatabaseAccountList.json b/...Microsoft.DocumentDB/preview/2021-04-01-preview/examples/CosmosDBDatabaseAccountList.json
@@ -79,6 +79,7 @@
               "enableAnalyticalStorage": true,
               "instanceId": "d9b26648-2f53-4541-b3d8-3044f4f9810d",
               "createMode": "Default",
+              "defaultIdentity": "FirstPartyIdentity",
               "backupPolicy": {
                 "type": "Periodic",
                 "periodicModeProperties": {

diff --git a/...entDB/preview/2021-04-01-preview/examples/CosmosDBDatabaseAccountListByResourceGroup.json b/...entDB/preview/2021-04-01-preview/examples/CosmosDBDatabaseAccountListByResourceGroup.json
@@ -64,6 +64,7 @@
               "enableFreeTier": false,
               "instanceId": "d9b26648-2f53-4541-b3d8-3044f4f9810d",
               "createMode": "Default",
+              "defaultIdentity": "FirstPartyIdentity",
               "backupPolicy": {
                 "type": "Periodic",
                 "periodicModeProperties": {

diff --git a/...manager/Microsoft.DocumentDB/preview/2021-04-01-preview/examples/CosmosDBLocationGet.json b/...manager/Microsoft.DocumentDB/preview/2021-04-01-preview/examples/CosmosDBLocationGet.json
@@ -0,0 +1,25 @@
+{
+  "parameters": {
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "location": "westus"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DocumentDB/locations/westus",
+        "type": "Microsoft.DocumentDB/locations",
+        "name": "westus",
+        "properties": {
+          "status": "ProductionSLA",
+          "supportsAvailabilityZone": true,
+          "isResidencyRestricted": true,
+          "backupStorageRedundancies": [
+            "Local",
+            "Geo"
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/...anager/Microsoft.DocumentDB/preview/2021-04-01-preview/examples/CosmosDBLocationList.json b/...anager/Microsoft.DocumentDB/preview/2021-04-01-preview/examples/CosmosDBLocationList.json
@@ -0,0 +1,42 @@
+{
+  "parameters": {
+    "api-version": "2021-04-01-preview",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DocumentDB/locations/westus",
+            "type": "Microsoft.DocumentDB/locations",
+            "name": "westus",
+            "properties": {
+              "status": "ProductionSLA",
+              "supportsAvailabilityZone": false,
+              "isResidencyRestricted": false,
+              "backupStorageRedundancies": [
+                "Local",
+                "Geo"
+              ]
+            }
+          },
+          {
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.DocumentDB/locations/centralus",
+            "type": "Microsoft.DocumentDB/locations",
+            "name": "centralus",
+            "properties": {
+              "status": "ProductionSLA",
+              "supportsAvailabilityZone": true,
+              "isResidencyRestricted": false,
+              "backupStorageRedundancies": [
+                "Zone",
+                "Geo"
+              ]
+            }
+          }
+        ]
+      }
+    }
+  }
+}