Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SqlDedicatedGateway DistributedQuery stable changes #28747

Merged
merged 4 commits into from
Apr 23, 2024
Merged

SqlDedicatedGateway DistributedQuery stable changes #28747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d93f5ba
Distributed Query changes
pjohari-ms Apr 16, 2024
ac2a748
Nits
pjohari-ms Apr 16, 2024
14fcc96
Fixed model validation
pjohari-ms Apr 18, 2024
e342e30
More fixes
pjohari-ms Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...osDBSqlDedicatedGatewayServiceCreate.json → ...osDBSqlDedicatedGatewayServiceCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"properties": {
"instanceSize": "Cosmos.D4s",
"instanceCount": 1,
"serviceType": "SqlDedicatedGateway"
"serviceType": "SqlDedicatedGateway",
"dedicatedGatewayType": "IntegratedCache"
}
}
},
Expand All @@ -26,6 +27,7 @@
"instanceSize": "Cosmos.D4s",
"instanceCount": 1,
"serviceType": "SqlDedicatedGateway",
"dedicatedGatewayType": "IntegratedCache",
"sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",
"locations": [
{
Expand Down
0 ...osDBSqlDedicatedGatewayServiceDelete.json → ...osDBSqlDedicatedGatewayServiceDelete.json
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...osmosDBSqlDedicatedGatewayServiceGet.json → ...osmosDBSqlDedicatedGatewayServiceGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"instanceSize": "Cosmos.D4s",
"instanceCount": 1,
"serviceType": "SqlDedicatedGateway",
"dedicatedGatewayType": "IntegratedCache",
"sqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",
"locations": [
{
Expand Down
72 changes: 68 additions & 4 deletions ...ification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2024-05-15/services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"$ref": "./examples/CosmosDBDataTransferServiceCreate.json"
},
"SqlDedicatedGatewayServiceCreate": {
"$ref": "./examples/CosmosDBSqlDedicatedGatewayServiceCreate.json"
"$ref": "./examples/services/sqldedicatedgateway/CosmosDBSqlDedicatedGatewayServiceCreate.json"
},
"GraphAPIComputeServiceCreate": {
"$ref": "./examples/CosmosDBGraphAPIComputeServiceCreate.json"
Expand Down Expand Up @@ -170,7 +170,7 @@
"$ref": "./examples/CosmosDBGraphAPIComputeServiceGet.json"
},
"SqlDedicatedGatewayServiceGet": {
"$ref": "./examples/CosmosDBSqlDedicatedGatewayServiceGet.json"
"$ref": "./examples/services/sqldedicatedgateway/CosmosDBSqlDedicatedGatewayServiceGet.json"
},
"MaterializedViewsBuilderServiceGet": {
"$ref": "./examples/CosmosDBMaterializedViewsBuilderServiceGet.json"
Expand Down Expand Up @@ -222,7 +222,7 @@
"$ref": "./examples/CosmosDBDataTransferServiceDelete.json"
},
"SqlDedicatedGatewayServiceDelete": {
"$ref": "./examples/CosmosDBSqlDedicatedGatewayServiceDelete.json"
"$ref": "./examples/services/sqldedicatedgateway/CosmosDBSqlDedicatedGatewayServiceDelete.json"
},
"GraphAPIComputeServiceDelete": {
"$ref": "./examples/CosmosDBGraphAPIComputeServiceDelete.json"
Expand Down Expand Up @@ -328,6 +328,7 @@
"ServiceResourceCreateUpdateProperties": {
"description": "Properties in ServiceResourceCreateUpdateParameters.",
"type": "object",
"discriminator": "serviceType",
"properties": {
"instanceSize": {
"$ref": "#/definitions/ServiceResourceInstanceSize"
Expand All @@ -341,7 +342,10 @@
"serviceType": {
"$ref": "#/definitions/ServiceType"
}
}
},
"required": [
"serviceType"
]
},
"ServiceResource": {
"description": "Properties for the database account.",
Expand Down Expand Up @@ -402,6 +406,43 @@
}
}
},
"DataTransferServiceResourceCreateUpdateParameters": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Name & description not matching.

"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",
Expand All @@ -426,6 +467,9 @@
"type": "string",
"description": "SqlDedicatedGateway endpoint for the service."
},
"dedicatedGatewayType": {
"$ref": "#/definitions/SqlDedicatedGatewayType"
},
"locations": {
"type": "array",
"readOnly": true,
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -500,6 +554,16 @@
}
}
},
"MaterializedViewsBuilderServiceResourceCreateUpdateParameters": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Description has to change to reflect 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",
Expand Down