From fb0ca7699c7d5d5b08c15834381acb16e5b8798f Mon Sep 17 00:00:00 2001 From: Stephen Budhi Date: Mon, 18 Oct 2021 06:47:34 -0700 Subject: [PATCH 1/6] Fix LimitObject polymorphism --- .../preview/2021-03-15-preview/quota.json | 36 ++++++++----------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json b/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json index f2c1233112d8..d6742f429770 100644 --- a/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json +++ b/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json @@ -867,34 +867,26 @@ }, "LimitObject": { "description": "The resource quota limit value.", - "type": "object", - "properties": { - "value": { - "type": "integer", - "format": "int32", - "description": "The quota/limit value" - }, - "limitObjectType": { - "$ref": "#/definitions/LimitObjectTypes" - }, - "limitType": { - "$ref": "#/definitions/LimitTypes" - } - }, - "required": [ - "value" - ] - }, - "LimitValue": { "x-ms-discriminator-value": "LimitValue", - "type": "object", - "description": "The resource quota limit.", "allOf": [ { "$ref": "#/definitions/LimitJsonObject" }, { - "$ref": "#/definitions/LimitObject" + "type": "object", + "properties": { + "value": { + "type": "integer", + "format": "int32", + "description": "The quota/limit value" + }, + "limitType": { + "$ref": "#/definitions/LimitTypes" + } + }, + "required": [ + "value" + ] } ] }, From 62067e50d465700925b81734bfd39d61533f6963 Mon Sep 17 00:00:00 2001 From: Stephen Budhi Date: Mon, 18 Oct 2021 07:23:40 -0700 Subject: [PATCH 2/6] move properties out of allOf --- .../preview/2021-03-15-preview/quota.json | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json b/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json index d6742f429770..b257495ccce3 100644 --- a/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json +++ b/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json @@ -871,24 +871,18 @@ "allOf": [ { "$ref": "#/definitions/LimitJsonObject" + } + ], + "properties": { + "value": { + "type": "integer", + "format": "int32", + "description": "The quota/limit value" }, - { - "type": "object", - "properties": { - "value": { - "type": "integer", - "format": "int32", - "description": "The quota/limit value" - }, - "limitType": { - "$ref": "#/definitions/LimitTypes" - } - }, - "required": [ - "value" - ] + "limitType": { + "$ref": "#/definitions/LimitTypes" } - ] + } }, "QuotaRequestOneResourceSubmitResponse": { "description": "Quota request response.", From b1c9a2b48a0099b59f8c9155577f02bdc3809d6d Mon Sep 17 00:00:00 2001 From: Stephen Budhi Date: Mon, 18 Oct 2021 07:32:52 -0700 Subject: [PATCH 3/6] add type to LimitObject --- .../Microsoft.Quota/preview/2021-03-15-preview/quota.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json b/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json index b257495ccce3..1e929cc72220 100644 --- a/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json +++ b/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json @@ -867,6 +867,7 @@ }, "LimitObject": { "description": "The resource quota limit value.", + "type": "object", "x-ms-discriminator-value": "LimitValue", "allOf": [ { From c9c7f6abfbcb81c5eebc0ffa4e5f7e0403492974 Mon Sep 17 00:00:00 2001 From: Stephen Budhi Date: Mon, 18 Oct 2021 07:47:42 -0700 Subject: [PATCH 4/6] value is required --- .../Microsoft.Quota/preview/2021-03-15-preview/quota.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json b/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json index 1e929cc72220..f3ee87dc4fed 100644 --- a/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json +++ b/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json @@ -883,7 +883,10 @@ "limitType": { "$ref": "#/definitions/LimitTypes" } - } + }, + "required": [ + "value" + ] }, "QuotaRequestOneResourceSubmitResponse": { "description": "Quota request response.", From 1a3be7ddd47dc96bd3f161bb124f2d4613d84a92 Mon Sep 17 00:00:00 2001 From: Rahul Singh <53578268+rahuls-microsoft@users.noreply.github.com> Date: Tue, 19 Oct 2021 16:13:10 -0700 Subject: [PATCH 5/6] Updating Operations Tag to QuotaOperations. --- .../Microsoft.Quota/preview/2021-03-15-preview/quota.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json b/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json index f3ee87dc4fed..2e5907e8b705 100644 --- a/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json +++ b/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json @@ -451,7 +451,7 @@ "get": { "summary": "GET operations.", "description": "List all the operations supported by the Microsoft.Quota resource provider.", - "operationId": "Operation_List", + "operationId": "QuotaOperation_List", "x-ms-examples": { "GetOperations": { "$ref": "./examples/GetOperations.json" From 1884a8e8b9d56ce6f7621f62f706344a9422e343 Mon Sep 17 00:00:00 2001 From: Rahul Singh <53578268+rahuls-microsoft@users.noreply.github.com> Date: Thu, 21 Oct 2021 12:46:18 -0700 Subject: [PATCH 6/6] Update quota.json Updating Summary field for operations. --- .../Microsoft.Quota/preview/2021-03-15-preview/quota.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json b/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json index 2e5907e8b705..e409972797b6 100644 --- a/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json +++ b/specification/quota/resource-manager/Microsoft.Quota/preview/2021-03-15-preview/quota.json @@ -449,7 +449,7 @@ }, "/providers/Microsoft.Quota/operations": { "get": { - "summary": "GET operations.", + "summary": "GET quota operations.", "description": "List all the operations supported by the Microsoft.Quota resource provider.", "operationId": "QuotaOperation_List", "x-ms-examples": {