Skip to content

Commit cebd1b7

Browse files
author
Meha Kaushik
committed
address arm comments and fix ci
1 parent d54ec66 commit cebd1b7

2 files changed

Lines changed: 15 additions & 55 deletions

File tree

specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-04-01-preview/examples/CosmosDBServicesList.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"body": {
1111
"value": [
1212
{
13-
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.DocumentDB/databaseAccounts/ddb1/services",
14-
"name": "SqlDedicatedGateway",
13+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.DocumentDB/databaseAccounts/ddb1/services/sqlDedicatedGateway",
14+
"name": "sqlDedicatedGateway",
1515
"type": "Microsoft.DocumentDB/databaseAccounts/services",
1616
"properties": {
1717
"status": "Running",
@@ -22,7 +22,7 @@
2222
"SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway.sqlx.cosmos.windows-int.net/",
2323
"locations": [
2424
{
25-
"name": "SqlDedicatedGateway-westus2",
25+
"name": "sqlDedicatedGateway-westus2",
2626
"location": "West US 2",
2727
"status": "Running",
2828
"SqlDedicatedGatewayEndpoint": "https://sqlDedicatedGateway-westus.sqlx.cosmos.windows-int.net/"

specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2021-04-01-preview/services.json

Lines changed: 12 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@
110110
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
111111
},
112112
{
113-
"name": "servicesCreateUpdateParameter",
113+
"name": "serviceResource",
114114
"in": "body",
115115
"required": true,
116116
"schema": {
117-
"$ref": "#/definitions/ServicesCreateUpdateParameters"
117+
"$ref": "#/definitions/ServiceResource"
118118
},
119119
"description": "The Service configuration parameters."
120120
}
@@ -238,45 +238,7 @@
238238
}
239239
},
240240
"definitions": {
241-
"ServicesCreateUpdateParameters": {
242-
"description": "Service create or update parameters.",
243-
"type": "object",
244-
"properties": {
245-
"properties": {
246-
"type": "object",
247-
"x-ms-client-flatten": true,
248-
"description": "The properties for creating services.",
249-
"$ref": "#/definitions/ServicesCreateUpdateProperties"
250-
}
251-
},
252-
"required": [
253-
"properties"
254-
],
255-
"x-ms-azure-resource": true
256-
},
257-
"ServicesCreateUpdateProperties": {
258-
"description": "Describes the service response property.",
259-
"type": "object",
260-
"properties": {
261-
"instanceSize": {
262-
"$ref": "#/definitions/ServiceResourceInstanceSize"
263-
},
264-
"instanceCount": {
265-
"description": "Instance count for the service.",
266-
"type": "integer",
267-
"minimum": 1,
268-
"format": "int32"
269-
},
270-
"serviceType": {
271-
"$ref": "#/definitions/ServiceType"
272-
}
273-
},
274-
"required": [
275-
"instanceSize",
276-
"instanceCount"
277-
]
278-
},
279-
"ServiceResourceGetProperties": {
241+
"ServiceResourceProperties": {
280242
"description": "Services response resource.",
281243
"type": "object",
282244
"discriminator": "serviceType",
@@ -303,9 +265,6 @@
303265
"$ref": "#/definitions/ServiceResourceStatus"
304266
}
305267
},
306-
"additionalProperties": {
307-
"type": "object"
308-
},
309268
"required": [
310269
"serviceType"
311270
],
@@ -322,7 +281,7 @@
322281
"properties": {
323282
"properties": {
324283
"x-ms-client-flatten": true,
325-
"$ref": "#/definitions/ServiceResourceGetProperties"
284+
"$ref": "#/definitions/ServiceResourceProperties"
326285
}
327286
}
328287
},
@@ -334,22 +293,22 @@
334293
"items": {
335294
"$ref": "#/definitions/ServiceResource"
336295
},
337-
"description": "List of SQL databases and their properties."
296+
"description": "List of Service Resource and their properties."
338297
}
339298
},
340-
"description": "The List operation response, that contains the SQL databases and their properties."
299+
"description": "The List operation response, that contains the Service Resource and their properties."
341300
},
342301
"DataTransferServiceResource": {
343302
"description": "Describes the service response property.",
344303
"type": "object",
345304
"properties": {
346305
"properties": {
347306
"x-ms-client-flatten": true,
348-
"$ref": "#/definitions/DataTransferServiceResourceGetProperties"
307+
"$ref": "#/definitions/DataTransferServiceResourceProperties"
349308
}
350309
}
351310
},
352-
"DataTransferServiceResourceGetProperties": {
311+
"DataTransferServiceResourceProperties": {
353312
"description": "Properties for DataTransferServiceResource.",
354313
"type": "object",
355314
"allOf": [
@@ -374,12 +333,12 @@
374333
"properties": {
375334
"properties": {
376335
"x-ms-client-flatten": true,
377-
"$ref": "#/definitions/SqlDedicatedGatewayServiceResourceGetProperties"
336+
"$ref": "#/definitions/SqlDedicatedGatewayServiceResourceProperties"
378337
}
379338
}
380339
},
381-
"SqlDedicatedGatewayServiceResourceGetProperties": {
382-
"description": "Properties for SqlDedicatedgatewayServiceResource.",
340+
"SqlDedicatedGatewayServiceResourceProperties": {
341+
"description": "Properties for SqlDedicatedGatewayServiceResource.",
383342
"type": "object",
384343
"allOf": [
385344
{
@@ -455,6 +414,7 @@
455414
"Error",
456415
"Stopped"
457416
],
417+
"readOnly": true,
458418
"description": "Describes the status of a service.",
459419
"x-ms-enum": {
460420
"modelAsString": true,

0 commit comments

Comments
 (0)