[CosmosDB] Fixing bugs in Services APIs (Azure#15971)

MehaKaushik · Meha Kaushik · web-flow · commit 6223e02c7f87 · 2021-09-14T15:31:15.000+08:00
* test

* try1

* fixing services discriminator

* prettier and readme

* revert additional changes

* fixing model validation errors

* model validation fix

* nit

Co-authored-by: Meha Kaushik &lt;mekaushi@microsoft.com&gt;
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-04-01-preview/examples/CosmosDBServicesList.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-04-01-preview/examples/CosmosDBServicesList.json
@@ -19,13 +19,13 @@
               "instanceSize": "Cosmos.D4s",
               "instanceCount": 1,
               "serviceType": "SqlDedicatedGateway",
-              "SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",
+              "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",
               "locations": [
                 {
                   "name": "sqlDedicatedGateway-westus2",
                   "location": "West US 2",
                   "status": "Running",
-                  "SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"
+                  "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"
                 }
               ]
             }
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-04-01-preview/examples/CosmosDBSqlDedicatedGatewayServiceCreate.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-04-01-preview/examples/CosmosDBSqlDedicatedGatewayServiceCreate.json
@@ -26,13 +26,13 @@
           "instanceSize": "Cosmos.D4s",
           "instanceCount": 1,
           "serviceType": "SqlDedicatedGateway",
-          "SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",
+          "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",
           "locations": [
             {
               "name": "SqlDedicatedGateway-westus2",
               "location": "West US 2",
               "status": "Running",
-              "SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"
+              "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"
             }
           ]
         }
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-04-01-preview/examples/CosmosDBSqlDedicatedGatewayServiceGet.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-04-01-preview/examples/CosmosDBSqlDedicatedGatewayServiceGet.json
@@ -18,13 +18,13 @@
           "instanceSize": "Cosmos.D4s",
           "instanceCount": 1,
           "serviceType": "SqlDedicatedGateway",
-          "SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",
+          "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",
           "locations": [
             {
               "name": "SqlDedicatedGateway-westus2",
               "location": "West US 2",
               "status": "Running",
-              "SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"
+              "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"
             }
           ]
         }
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-04-01-preview/services.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-04-01-preview/services.json
@@ -114,7 +114,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/ServiceResource"
+              "$ref": "#/definitions/ServiceResourceCreateUpdateParameters"
             },
             "description": "The Service resource parameters."
           }
@@ -288,6 +288,34 @@
         }
       }
     },
+    "ServiceResourceCreateUpdateParameters": {
+      "description": "Parameters for Create or Update Request for ServiceResource",
+      "type": "object",
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ServiceResourceCreateUpdateProperties"
+        }
+      }
+    },
+    "ServiceResourceCreateUpdateProperties": {
+      "description": "Properties in ServiceResourceCreateUpdateParameters.",
+      "type": "object",
+      "properties": {
+        "instanceSize": {
+          "$ref": "#/definitions/ServiceResourceInstanceSize"
+        },
+        "instanceCount": {
+          "description": "Instance count for the service.",
+          "type": "integer",
+          "minimum": 0,
+          "format": "int32"
+        },
+        "serviceType": {
+          "$ref": "#/definitions/ServiceType"
+        }
+      }
+    },
     "ServiceResourceListResult": {
       "properties": {
         "value": {
@@ -314,6 +342,7 @@
     "DataTransferServiceResourceProperties": {
       "description": "Properties for DataTransferServiceResource.",
       "type": "object",
+      "x-ms-discriminator-value": "DataTransfer",
       "allOf": [
         {
           "$ref": "#/definitions/ServiceResourceProperties"
@@ -343,6 +372,7 @@
     "SqlDedicatedGatewayServiceResourceProperties": {
       "description": "Properties for SqlDedicatedGatewayServiceResource.",
       "type": "object",
+      "x-ms-discriminator-value": "SqlDedicatedGateway",
       "allOf": [
         {
           "$ref": "#/definitions/ServiceResourceProperties"
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-07-01-preview/examples/CosmosDBServicesList.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-07-01-preview/examples/CosmosDBServicesList.json
@@ -19,13 +19,13 @@
               "instanceSize": "Cosmos.D4s",
               "instanceCount": 1,
               "serviceType": "SqlDedicatedGateway",
-              "SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",
+              "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",
               "locations": [
                 {
                   "name": "sqlDedicatedGateway-westus2",
                   "location": "West US 2",
                   "status": "Running",
-                  "SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"
+                  "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"
                 }
               ]
             }
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-07-01-preview/examples/CosmosDBSqlDedicatedGatewayServiceCreate.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-07-01-preview/examples/CosmosDBSqlDedicatedGatewayServiceCreate.json
@@ -26,13 +26,13 @@
           "instanceSize": "Cosmos.D4s",
           "instanceCount": 1,
           "serviceType": "SqlDedicatedGateway",
-          "SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",
+          "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",
           "locations": [
             {
               "name": "SqlDedicatedGateway-westus2",
               "location": "West US 2",
               "status": "Running",
-              "SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"
+              "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"
             }
           ]
         }
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-07-01-preview/examples/CosmosDBSqlDedicatedGatewayServiceGet.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-07-01-preview/examples/CosmosDBSqlDedicatedGatewayServiceGet.json
@@ -18,13 +18,13 @@
           "instanceSize": "Cosmos.D4s",
           "instanceCount": 1,
           "serviceType": "SqlDedicatedGateway",
-          "SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",
+          "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",
           "locations": [
             {
               "name": "SqlDedicatedGateway-westus2",
               "location": "West US 2",
               "status": "Running",
-              "SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"
+              "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"
             }
           ]
         }
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-07-01-preview/services.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-07-01-preview/services.json
@@ -118,7 +118,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/ServiceResource"
+              "$ref": "#/definitions/ServiceResourceCreateUpdateParameters"
             },
             "description": "The Service resource parameters."
           }
@@ -285,6 +285,34 @@
         "serviceType"
       ]
     },
+    "ServiceResourceCreateUpdateParameters": {
+      "description": "Parameters for Create or Update Request for ServiceResource",
+      "type": "object",
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ServiceResourceCreateUpdateProperties"
+        }
+      }
+    },
+    "ServiceResourceCreateUpdateProperties": {
+      "description": "Properties in ServiceResourceCreateUpdateParameters.",
+      "type": "object",
+      "properties": {
+        "instanceSize": {
+          "$ref": "#/definitions/ServiceResourceInstanceSize"
+        },
+        "instanceCount": {
+          "description": "Instance count for the service.",
+          "type": "integer",
+          "minimum": 0,
+          "format": "int32"
+        },
+        "serviceType": {
+          "$ref": "#/definitions/ServiceType"
+        }
+      }
+    },
     "ServiceResource": {
       "description": "Properties for the database account.",
       "type": "object",
@@ -327,6 +355,7 @@
     "DataTransferServiceResourceProperties": {
       "description": "Properties for DataTransferServiceResource.",
       "type": "object",
+      "x-ms-discriminator-value": "DataTransfer",
       "allOf": [
         {
           "$ref": "#/definitions/ServiceResourceProperties"
@@ -356,6 +385,7 @@
     "SqlDedicatedGatewayServiceResourceProperties": {
       "description": "Properties for SqlDedicatedGatewayServiceResource.",
       "type": "object",
+      "x-ms-discriminator-value": "SqlDedicatedGateway",
       "allOf": [
         {
           "$ref": "#/definitions/ServiceResourceProperties"
@@ -389,6 +419,7 @@
     "GraphAPIComputeServiceResourceProperties": {
       "description": "Properties for GraphAPIComputeServiceResource.",
       "type": "object",
+      "x-ms-discriminator-value": "GraphAPICompute",
       "allOf": [
         {
           "$ref": "#/definitions/ServiceResourceProperties"

Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,13 @@`
`19`	`19`	`"instanceSize": "Cosmos.D4s",`
`20`	`20`	`"instanceCount": 1,`
`21`	`21`	`"serviceType": "SqlDedicatedGateway",`
`22`		`- "SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",`
	`22`	`+ "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",`
`23`	`23`	`"locations": [`
`24`	`24`	`{`
`25`	`25`	`"name": "sqlDedicatedGateway-westus2",`
`26`	`26`	`"location": "West US 2",`
`27`	`27`	`"status": "Running",`
`28`		`- "SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"`
	`28`	`+ "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"`
`29`	`29`	`}`
`30`	`30`	`]`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,13 @@`
`26`	`26`	`"instanceSize": "Cosmos.D4s",`
`27`	`27`	`"instanceCount": 1,`
`28`	`28`	`"serviceType": "SqlDedicatedGateway",`
`29`		`- "SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",`
	`29`	`+ "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",`
`30`	`30`	`"locations": [`
`31`	`31`	`{`
`32`	`32`	`"name": "SqlDedicatedGateway-westus2",`
`33`	`33`	`"location": "West US 2",`
`34`	`34`	`"status": "Running",`
`35`		`- "SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"`
	`35`	`+ "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"`
`36`	`36`	`}`
`37`	`37`	`]`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,13 +18,13 @@`
`18`	`18`	`"instanceSize": "Cosmos.D4s",`
`19`	`19`	`"instanceCount": 1,`
`20`	`20`	`"serviceType": "SqlDedicatedGateway",`
`21`		`- "SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",`
	`21`	`+ "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",`
`22`	`22`	`"locations": [`
`23`	`23`	`{`
`24`	`24`	`"name": "SqlDedicatedGateway-westus2",`
`25`	`25`	`"location": "West US 2",`
`26`	`26`	`"status": "Running",`
`27`		`- "SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"`
	`27`	`+ "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"`
`28`	`28`	`}`
`29`	`29`	`]`
`30`	`30`	`}`