Skip to content

address arm comments and fix ci #14

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

Merged
MehaKaushik merged 1 commit into from
Apr 21, 2021
Merged

address arm comments and fix ci #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ...anager/Microsoft.DocumentDB/preview/2021-04-01-preview/examples/CosmosDBServicesList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"body": {
"value": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.DocumentDB/databaseAccounts/ddb1/services",
"name": "SqlDedicatedGateway",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.DocumentDB/databaseAccounts/ddb1/services/sqlDedicatedGateway",
"name": "sqlDedicatedGateway",
"type": "Microsoft.DocumentDB/databaseAccounts/services",
"properties": {
"status": "Running",
Expand All @@ -22,7 +22,7 @@
"SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",
"locations": [
{
"name": "SqlDedicatedGateway-westus2",
"name": "sqlDedicatedGateway-westus2",
"location": "West US 2",
"status": "Running",
"SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"
Expand Down
64 changes: 12 additions & 52 deletions .../cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-04-01-preview/services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,11 @@
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
},
{
"name": "servicesCreateUpdateParameter",
"name": "serviceResource",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/ServicesCreateUpdateParameters"
"$ref": "#/definitions/ServiceResource"
},
"description": "The Service configuration parameters."
}
Expand Down Expand Up @@ -238,45 +238,7 @@
}
},
"definitions": {
"ServicesCreateUpdateParameters": {
"description": "Service create or update parameters.",
"type": "object",
"properties": {
"properties": {
"type": "object",
"x-ms-client-flatten": true,
"description": "The properties for creating services.",
"$ref": "#/definitions/ServicesCreateUpdateProperties"
}
},
"required": [
"properties"
],
"x-ms-azure-resource": true
},
"ServicesCreateUpdateProperties": {
"description": "Describes the service response property.",
"type": "object",
"properties": {
"instanceSize": {
"$ref": "#/definitions/ServiceResourceInstanceSize"
},
"instanceCount": {
"description": "Instance count for the service.",
"type": "integer",
"minimum": 1,
"format": "int32"
},
"serviceType": {
"$ref": "#/definitions/ServiceType"
}
},
"required": [
"instanceSize",
"instanceCount"
]
},
"ServiceResourceGetProperties": {
"ServiceResourceProperties": {
"description": "Services response resource.",
"type": "object",
"discriminator": "serviceType",
Expand All @@ -303,9 +265,6 @@
"$ref": "#/definitions/ServiceResourceStatus"
}
},
"additionalProperties": {
"type": "object"
},
"required": [
"serviceType"
],
Expand All @@ -322,7 +281,7 @@
"properties": {
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/ServiceResourceGetProperties"
"$ref": "#/definitions/ServiceResourceProperties"
}
}
},
Expand All @@ -334,22 +293,22 @@
"items": {
"$ref": "#/definitions/ServiceResource"
},
"description": "List of SQL databases and their properties."
"description": "List of Service Resource and their properties."
}
},
"description": "The List operation response, that contains the SQL databases and their properties."
"description": "The List operation response, that contains the Service Resource and their properties."
},
"DataTransferServiceResource": {
"description": "Describes the service response property.",
"type": "object",
"properties": {
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/DataTransferServiceResourceGetProperties"
"$ref": "#/definitions/DataTransferServiceResourceProperties"
}
}
},
"DataTransferServiceResourceGetProperties": {
"DataTransferServiceResourceProperties": {
"description": "Properties for DataTransferServiceResource.",
"type": "object",
"allOf": [
Expand All @@ -374,12 +333,12 @@
"properties": {
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/SqlDedicatedGatewayServiceResourceGetProperties"
"$ref": "#/definitions/SqlDedicatedGatewayServiceResourceProperties"
}
}
},
"SqlDedicatedGatewayServiceResourceGetProperties": {
"description": "Properties for SqlDedicatedgatewayServiceResource.",
"SqlDedicatedGatewayServiceResourceProperties": {
"description": "Properties for SqlDedicatedGatewayServiceResource.",
"type": "object",
"allOf": [
{
Expand Down Expand Up @@ -455,6 +414,7 @@
"Error",
"Stopped"
],
"readOnly": true,
"description": "Describes the status of a service.",
"x-ms-enum": {
"modelAsString": true,
Expand Down
⚡