SqlDedicatedGateway DistributedQuery stable changes (#28747)

* Distributed Query changes * Nits * Fixed model validation * More fixes
Azure · Apr 23, 2024 · 1ed0f49 · 1ed0f49
1 parent d11a274
commit 1ed0f49
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 5 deletions.
diff --git a/...osDBSqlDedicatedGatewayServiceCreate.json → ...osDBSqlDedicatedGatewayServiceCreate.json b/...osDBSqlDedicatedGatewayServiceCreate.json → ...osDBSqlDedicatedGatewayServiceCreate.json
@@ -9,7 +9,8 @@
       "properties": {
         "instanceSize": "Cosmos.D4s",
         "instanceCount": 1,
-        "serviceType": "SqlDedicatedGateway"
+        "serviceType": "SqlDedicatedGateway",
+        "dedicatedGatewayType": "IntegratedCache"
       }
     }
   },
@@ -26,6 +27,7 @@
           "instanceSize": "Cosmos.D4s",
           "instanceCount": 1,
           "serviceType": "SqlDedicatedGateway",
+          "dedicatedGatewayType": "IntegratedCache",
           "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",
           "locations": [
             {

diff --git a/...osDBSqlDedicatedGatewayServiceDelete.json → ...osDBSqlDedicatedGatewayServiceDelete.json b/...osDBSqlDedicatedGatewayServiceDelete.json → ...osDBSqlDedicatedGatewayServiceDelete.json
diff --git a/...osmosDBSqlDedicatedGatewayServiceGet.json → ...osmosDBSqlDedicatedGatewayServiceGet.json b/...osmosDBSqlDedicatedGatewayServiceGet.json → ...osmosDBSqlDedicatedGatewayServiceGet.json
@@ -18,6 +18,7 @@
           "instanceSize": "Cosmos.D4s",
           "instanceCount": 1,
           "serviceType": "SqlDedicatedGateway",
+          "dedicatedGatewayType": "IntegratedCache",
           "sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",
           "locations": [
             {

diff --git a/...ification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2024-05-15/services.json b/...ification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2024-05-15/services.json
@@ -89,7 +89,7 @@
             "$ref": "./examples/CosmosDBDataTransferServiceCreate.json"
           },
           "SqlDedicatedGatewayServiceCreate": {
-            "$ref": "./examples/CosmosDBSqlDedicatedGatewayServiceCreate.json"
+            "$ref": "./examples/services/sqldedicatedgateway/CosmosDBSqlDedicatedGatewayServiceCreate.json"
           },
           "GraphAPIComputeServiceCreate": {
             "$ref": "./examples/CosmosDBGraphAPIComputeServiceCreate.json"
@@ -170,7 +170,7 @@
             "$ref": "./examples/CosmosDBGraphAPIComputeServiceGet.json"
           },
           "SqlDedicatedGatewayServiceGet": {
-            "$ref": "./examples/CosmosDBSqlDedicatedGatewayServiceGet.json"
+            "$ref": "./examples/services/sqldedicatedgateway/CosmosDBSqlDedicatedGatewayServiceGet.json"
           },
           "MaterializedViewsBuilderServiceGet": {
             "$ref": "./examples/CosmosDBMaterializedViewsBuilderServiceGet.json"
@@ -222,7 +222,7 @@
             "$ref": "./examples/CosmosDBDataTransferServiceDelete.json"
           },
           "SqlDedicatedGatewayServiceDelete": {
-            "$ref": "./examples/CosmosDBSqlDedicatedGatewayServiceDelete.json"
+            "$ref": "./examples/services/sqldedicatedgateway/CosmosDBSqlDedicatedGatewayServiceDelete.json"
           },
           "GraphAPIComputeServiceDelete": {
             "$ref": "./examples/CosmosDBGraphAPIComputeServiceDelete.json"
@@ -328,6 +328,7 @@
     "ServiceResourceCreateUpdateProperties": {
       "description": "Properties in ServiceResourceCreateUpdateParameters.",
       "type": "object",
+      "discriminator": "serviceType",
       "properties": {
         "instanceSize": {
           "$ref": "#/definitions/ServiceResourceInstanceSize"
@@ -341,7 +342,10 @@
         "serviceType": {
           "$ref": "#/definitions/ServiceType"
         }
-      }
+      },
+      "required": [
+        "serviceType"
+      ]
     },
     "ServiceResource": {
       "description": "Properties for the database account.",
@@ -402,6 +406,43 @@
         }
       }
     },
+    "DataTransferServiceResourceCreateUpdateParameters": {
+      "description": "Parameters for Create or Update Request for SqlDedicatedGatewayServiceResource",
+      "type": "object",
+      "x-ms-discriminator-value": "DataTransfer",
+      "allOf": [
+        {
+          "$ref": "#/definitions/ServiceResourceCreateUpdateProperties"
+        }
+      ]
+    },
+    "SqlDedicatedGatewayServiceResourceCreateUpdateParameters": {
+      "description": "Parameters for Create or Update Request for SqlDedicatedGatewayServiceResource",
+      "type": "object",
+      "x-ms-discriminator-value": "SqlDedicatedGateway",
+      "allOf": [
+        {
+          "$ref": "#/definitions/ServiceResourceCreateUpdateProperties"
+        }
+      ],
+      "properties": {
+        "dedicatedGatewayType": {
+          "$ref": "#/definitions/SqlDedicatedGatewayType"
+        }
+      }
+    },
+    "SqlDedicatedGatewayType": {
+      "type": "string",
+      "enum": [
+        "IntegratedCache",
+        "DistributedQuery"
+      ],
+      "description": "DedicatedGatewayType for the service.",
+      "x-ms-enum": {
+        "modelAsString": true,
+        "name": "DedicatedGatewayType"
+      }
+    },
     "SqlDedicatedGatewayServiceResource": {
       "description": "Describes the service response property for SqlDedicatedGateway.",
       "type": "object",
@@ -426,6 +467,9 @@
           "type": "string",
           "description": "SqlDedicatedGateway endpoint for the service."
         },
+        "dedicatedGatewayType": {
+          "$ref": "#/definitions/SqlDedicatedGatewayType"
+        },
         "locations": {
           "type": "array",
           "readOnly": true,
@@ -470,6 +514,16 @@
         }
       }
     },
+    "GraphAPIComputeServiceResourceCreateUpdateParameters": {
+      "description": "Parameters for Create or Update Request for SqlDedicatedGatewayServiceResource",
+      "type": "object",
+      "x-ms-discriminator-value": "GraphAPICompute",
+      "allOf": [
+        {
+          "$ref": "#/definitions/ServiceResourceCreateUpdateProperties"
+        }
+      ]
+    },
     "MaterializedViewsBuilderServiceResource": {
       "description": "Describes the service response property for MaterializedViewsBuilder.",
       "type": "object",
@@ -500,6 +554,16 @@
         }
       }
     },
+    "MaterializedViewsBuilderServiceResourceCreateUpdateParameters": {
+      "description": "Parameters for Create or Update Request for SqlDedicatedGatewayServiceResource",
+      "type": "object",
+      "x-ms-discriminator-value": "MaterializedViewsBuilder",
+      "allOf": [
+        {
+          "$ref": "#/definitions/ServiceResourceCreateUpdateProperties"
+        }
+      ]
+    },
     "RegionalServiceResource": {
       "description": "Resource for a regional service location.",
       "type": "object",