Skip to content

Commit

Permalink
[ReleasePR cosmos-db] [CosmosDB] Fixing bugs in Services APIs (#1903)
Browse files Browse the repository at this point in the history 
Create to sync Azure/azure-rest-api-specs#15971
[ReCreate this PR](https://github.com/azure-resource-manager-schemas/compare/main...AzureSDKAutomation:sdkAuto/cosmos-db?expand=1)
  • Loading branch information
msftbot[bot] authored Sep 14, 2021
2 parents e607757 + 407888b commit f5bcb25
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 150 deletions.
84 changes: 20 additions & 64 deletions schemas/2021-04-01-preview/Microsoft.DocumentDB.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1305,13 +1305,13 @@
"properties": {
"oneOf": [
{
"$ref": "#/definitions/ServiceResourceProperties"
"$ref": "#/definitions/ServiceResourceCreateUpdateProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Services response resource."
"description": "Properties in ServiceResourceCreateUpdateParameters."
},
"type": {
"type": "string",
Expand Down Expand Up @@ -4041,13 +4041,13 @@
"properties": {
"oneOf": [
{
"$ref": "#/definitions/ServiceResourceProperties"
"$ref": "#/definitions/ServiceResourceCreateUpdateProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Services response resource."
"description": "Properties in ServiceResourceCreateUpdateParameters."
},
"type": {
"type": "string",
Expand Down Expand Up @@ -4840,21 +4840,6 @@
},
"description": "Properties of a managed Cassandra data center."
},
"DataTransferServiceResourceProperties": {
"type": "object",
"properties": {
"serviceType": {
"type": "string",
"enum": [
"DataTransferServiceResourceProperties"
]
}
},
"required": [
"serviceType"
],
"description": "Properties for DataTransferServiceResource."
},
"DefaultRequestDatabaseAccountCreateUpdateProperties": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -5723,33 +5708,9 @@
}
}
},
"ServiceResourceProperties": {
"ServiceResourceCreateUpdateProperties": {
"type": "object",
"oneOf": [
{
"$ref": "#/definitions/DataTransferServiceResourceProperties"
},
{
"$ref": "#/definitions/SqlDedicatedGatewayServiceResourceProperties"
}
],
"properties": {
"additionalProperties": {
"oneOf": [
{
"type": "object",
"additionalProperties": {
"type": "object",
"properties": {}
},
"properties": {}
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Unmatched properties from the message are deserialized this collection"
},
"instanceCount": {
"oneOf": [
{
Expand All @@ -5776,9 +5737,23 @@
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
]
},
"serviceType": {
"oneOf": [
{
"type": "string",
"enum": [
"SqlDedicatedGateway",
"DataTransfer"
]
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
]
}
},
"description": "Services response resource."
"description": "Properties in ServiceResourceCreateUpdateParameters."
},
"SpatialSpec": {
"type": "object",
Expand Down Expand Up @@ -5963,25 +5938,6 @@
],
"description": "Cosmos DB SQL database resource object"
},
"SqlDedicatedGatewayServiceResourceProperties": {
"type": "object",
"properties": {
"serviceType": {
"type": "string",
"enum": [
"SqlDedicatedGatewayServiceResourceProperties"
]
},
"sqlDedicatedGatewayEndpoint": {
"type": "string",
"description": "SqlDedicatedGateway endpoint for the service."
}
},
"required": [
"serviceType"
],
"description": "Properties for SqlDedicatedGatewayServiceResource."
},
"SqlRoleAssignmentResource": {
"type": "object",
"properties": {
Expand Down
107 changes: 21 additions & 86 deletions schemas/2021-07-01-preview/Microsoft.DocumentDB.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1535,13 +1535,13 @@
"properties": {
"oneOf": [
{
"$ref": "#/definitions/ServiceResourceProperties"
"$ref": "#/definitions/ServiceResourceCreateUpdateProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Services response resource."
"description": "Properties in ServiceResourceCreateUpdateParameters."
},
"type": {
"type": "string",
Expand Down Expand Up @@ -4644,13 +4644,13 @@
"properties": {
"oneOf": [
{
"$ref": "#/definitions/ServiceResourceProperties"
"$ref": "#/definitions/ServiceResourceCreateUpdateProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Services response resource."
"description": "Properties in ServiceResourceCreateUpdateParameters."
},
"type": {
"type": "string",
Expand Down Expand Up @@ -5443,21 +5443,6 @@
},
"description": "Properties of a managed Cassandra data center."
},
"DataTransferServiceResourceProperties": {
"type": "object",
"properties": {
"serviceType": {
"type": "string",
"enum": [
"DataTransferServiceResourceProperties"
]
}
},
"required": [
"serviceType"
],
"description": "Properties for DataTransferServiceResource."
},
"DefaultRequestDatabaseAccountCreateUpdateProperties": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -5504,25 +5489,6 @@
}
}
},
"GraphAPIComputeServiceResourceProperties": {
"type": "object",
"properties": {
"graphApiComputeEndpoint": {
"type": "string",
"description": "GraphAPICompute endpoint for the service."
},
"serviceType": {
"type": "string",
"enum": [
"GraphAPIComputeServiceResourceProperties"
]
}
},
"required": [
"serviceType"
],
"description": "Properties for GraphAPIComputeServiceResource."
},
"GraphResource": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -6385,36 +6351,9 @@
}
}
},
"ServiceResourceProperties": {
"ServiceResourceCreateUpdateProperties": {
"type": "object",
"oneOf": [
{
"$ref": "#/definitions/DataTransferServiceResourceProperties"
},
{
"$ref": "#/definitions/SqlDedicatedGatewayServiceResourceProperties"
},
{
"$ref": "#/definitions/GraphAPIComputeServiceResourceProperties"
}
],
"properties": {
"additionalProperties": {
"oneOf": [
{
"type": "object",
"additionalProperties": {
"type": "object",
"properties": {}
},
"properties": {}
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Unmatched properties from the message are deserialized this collection"
},
"instanceCount": {
"oneOf": [
{
Expand All @@ -6441,9 +6380,24 @@
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
]
},
"serviceType": {
"oneOf": [
{
"type": "string",
"enum": [
"SqlDedicatedGateway",
"DataTransfer",
"GraphAPICompute"
]
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
]
}
},
"description": "Services response resource."
"description": "Properties in ServiceResourceCreateUpdateParameters."
},
"SpatialSpec": {
"type": "object",
Expand Down Expand Up @@ -6628,25 +6582,6 @@
],
"description": "Cosmos DB SQL database resource object"
},
"SqlDedicatedGatewayServiceResourceProperties": {
"type": "object",
"properties": {
"serviceType": {
"type": "string",
"enum": [
"SqlDedicatedGatewayServiceResourceProperties"
]
},
"sqlDedicatedGatewayEndpoint": {
"type": "string",
"description": "SqlDedicatedGateway endpoint for the service."
}
},
"required": [
"serviceType"
],
"description": "Properties for SqlDedicatedGatewayServiceResource."
},
"SqlRoleAssignmentResource": {
"type": "object",
"properties": {
Expand Down

0 comments on commit f5bcb25

Please sign in to comment.