From 471166de0b9f3ba1c7b531ea5f9e443d2824e1d5 Mon Sep 17 00:00:00 2001 From: Arcturus Zhang Date: Thu, 9 Dec 2021 17:27:08 +0800 Subject: [PATCH 1/5] add x-ms-enum to storage --- .../Microsoft.Storage/stable/2021-06-01/blob.json | 6 ++++++ .../Microsoft.Storage/stable/2021-06-01/file.json | 3 +++ .../Microsoft.Storage/stable/2021-06-01/queue.json | 3 +++ .../Microsoft.Storage/stable/2021-06-01/table.json | 3 +++ 4 files changed, 15 insertions(+) diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/blob.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/blob.json index 6d1b797069b8..7c02c9b03f3d 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/blob.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/blob.json @@ -1564,6 +1564,9 @@ "enum": [ "default" ], + "x-ms-enum": { + "modelAsString": false + }, "x-ms-parameter-location": "method" }, "BlobServicesName": { @@ -1575,6 +1578,9 @@ "enum": [ "default" ], + "x-ms-enum": { + "modelAsString": false + }, "x-ms-parameter-location": "method" } }, diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/file.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/file.json index 6373872fb712..66d32f254a69 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/file.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/file.json @@ -1042,6 +1042,9 @@ "enum": [ "default" ], + "x-ms-enum": { + "modelAsString": false + }, "x-ms-parameter-location": "method" }, "ShareName": { diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/queue.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/queue.json index e1790c507a2e..71524212b50e 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/queue.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/queue.json @@ -525,6 +525,9 @@ "enum": [ "default" ], + "x-ms-enum": { + "modelAsString": false + }, "x-ms-parameter-location": "method" }, "QueueName": { diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/table.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/table.json index daf8f62477e3..1cd07149f0d3 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/table.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/table.json @@ -460,6 +460,9 @@ "enum": [ "default" ], + "x-ms-enum": { + "modelAsString": false + }, "x-ms-parameter-location": "method" }, "TableName": { From 2320b393b2642be152ec0785edbca23fcd572641 Mon Sep 17 00:00:00 2001 From: ArcturusZhang Date: Fri, 10 Dec 2021 11:21:44 +0800 Subject: [PATCH 2/5] add name --- .../stable/2021-06-01/blob.json | 16 +++++++++------- .../stable/2021-06-01/file.json | 7 ++++--- .../stable/2021-06-01/table.json | 7 ++++--- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/blob.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/blob.json index 7c02c9b03f3d..5afaba238bef 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/blob.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/blob.json @@ -84,7 +84,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/BlobServicesName" + "$ref": "#/parameters/BlobServicesNameParameter" }, { "name": "parameters", @@ -130,7 +130,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/BlobServicesName" + "$ref": "#/parameters/BlobServicesNameParameter" } ], "responses": { @@ -520,7 +520,7 @@ "$ref": "#/parameters/ContainerName" }, { - "$ref": "#/parameters/ImmutabilityPolicyName" + "$ref": "#/parameters/ImmutabilityPolicyNameParameter" }, { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -581,7 +581,7 @@ "$ref": "#/parameters/ContainerName" }, { - "$ref": "#/parameters/ImmutabilityPolicyName" + "$ref": "#/parameters/ImmutabilityPolicyNameParameter" }, { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -634,7 +634,7 @@ "$ref": "#/parameters/ContainerName" }, { - "$ref": "#/parameters/ImmutabilityPolicyName" + "$ref": "#/parameters/ImmutabilityPolicyNameParameter" }, { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -1555,7 +1555,7 @@ "minLength": 3, "x-ms-parameter-location": "method" }, - "ImmutabilityPolicyName": { + "ImmutabilityPolicyNameParameter": { "name": "immutabilityPolicyName", "in": "path", "required": true, @@ -1565,11 +1565,12 @@ "default" ], "x-ms-enum": { + "name": "ImmutabilityPolicyName", "modelAsString": false }, "x-ms-parameter-location": "method" }, - "BlobServicesName": { + "BlobServicesNameParameter": { "name": "BlobServicesName", "in": "path", "required": true, @@ -1579,6 +1580,7 @@ "default" ], "x-ms-enum": { + "name": "BlobServicesName", "modelAsString": false }, "x-ms-parameter-location": "method" diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/file.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/file.json index 66d32f254a69..c453a82b1aa9 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/file.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/file.json @@ -90,7 +90,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/FileServicesName" + "$ref": "#/parameters/FileServicesNameParameter" }, { "name": "parameters", @@ -142,7 +142,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/FileServicesName" + "$ref": "#/parameters/FileServicesNameParameter" } ], "responses": { @@ -1033,7 +1033,7 @@ } }, "parameters": { - "FileServicesName": { + "FileServicesNameParameter": { "name": "FileServicesName", "in": "path", "required": true, @@ -1043,6 +1043,7 @@ "default" ], "x-ms-enum": { + "name": "FileServicesName", "modelAsString": false }, "x-ms-parameter-location": "method" diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/table.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/table.json index 1cd07149f0d3..06947a9f632e 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/table.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/table.json @@ -84,7 +84,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/TableServiceName" + "$ref": "#/parameters/TableServiceNameParameter" }, { "name": "parameters", @@ -136,7 +136,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/TableServiceName" + "$ref": "#/parameters/TableServiceNameParameter" } ], "responses": { @@ -451,7 +451,7 @@ } }, "parameters": { - "TableServiceName": { + "TableServiceNameParameter": { "name": "tableServiceName", "in": "path", "required": true, @@ -461,6 +461,7 @@ "default" ], "x-ms-enum": { + "name": "TableServiceName", "modelAsString": false }, "x-ms-parameter-location": "method" From 6ab26c1409926ac8dac5f2e8f6921d8d179649ba Mon Sep 17 00:00:00 2001 From: ArcturusZhang Date: Fri, 10 Dec 2021 11:43:36 +0800 Subject: [PATCH 3/5] fix again --- .../Microsoft.Storage/stable/2021-06-01/queue.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/queue.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/queue.json index 71524212b50e..7b92ca73b25d 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/queue.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/queue.json @@ -84,7 +84,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/QueueServiceName" + "$ref": "#/parameters/QueueServiceNameParameter" }, { "name": "parameters", @@ -136,7 +136,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/QueueServiceName" + "$ref": "#/parameters/QueueServiceNameParameter" } ], "responses": { @@ -516,7 +516,7 @@ } }, "parameters": { - "QueueServiceName": { + "QueueServiceNameParameter": { "name": "queueServiceName", "in": "path", "required": true, @@ -526,6 +526,7 @@ "default" ], "x-ms-enum": { + "name": "QueueServiceName", "modelAsString": false }, "x-ms-parameter-location": "method" From 5e947ff2ba895cd496635f4614ad28911cc97123 Mon Sep 17 00:00:00 2001 From: Arcturus Zhang Date: Wed, 15 Dec 2021 11:07:46 +0800 Subject: [PATCH 4/5] change one parameter name back to see if it breaks --- .../Microsoft.Storage/stable/2021-06-01/blob.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/blob.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/blob.json index 5afaba238bef..eed9ffd2c3fc 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/blob.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/blob.json @@ -84,7 +84,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/BlobServicesNameParameter" + "$ref": "#/parameters/BlobServicesName" }, { "name": "parameters", @@ -130,7 +130,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/BlobServicesNameParameter" + "$ref": "#/parameters/BlobServicesName" } ], "responses": { @@ -1570,7 +1570,7 @@ }, "x-ms-parameter-location": "method" }, - "BlobServicesNameParameter": { + "BlobServicesName": { "name": "BlobServicesName", "in": "path", "required": true, From 7fc6d91683c0eb91ca5ae85ca67e0bd8bb7a2ce5 Mon Sep 17 00:00:00 2001 From: Arcturus Zhang Date: Wed, 15 Dec 2021 11:27:42 +0800 Subject: [PATCH 5/5] change the parameter name back --- .../Microsoft.Storage/stable/2021-06-01/blob.json | 8 ++++---- .../Microsoft.Storage/stable/2021-06-01/file.json | 6 +++--- .../Microsoft.Storage/stable/2021-06-01/queue.json | 6 +++--- .../Microsoft.Storage/stable/2021-06-01/table.json | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/blob.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/blob.json index eed9ffd2c3fc..815a3c59446e 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/blob.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/blob.json @@ -520,7 +520,7 @@ "$ref": "#/parameters/ContainerName" }, { - "$ref": "#/parameters/ImmutabilityPolicyNameParameter" + "$ref": "#/parameters/ImmutabilityPolicyName" }, { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -581,7 +581,7 @@ "$ref": "#/parameters/ContainerName" }, { - "$ref": "#/parameters/ImmutabilityPolicyNameParameter" + "$ref": "#/parameters/ImmutabilityPolicyName" }, { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -634,7 +634,7 @@ "$ref": "#/parameters/ContainerName" }, { - "$ref": "#/parameters/ImmutabilityPolicyNameParameter" + "$ref": "#/parameters/ImmutabilityPolicyName" }, { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -1555,7 +1555,7 @@ "minLength": 3, "x-ms-parameter-location": "method" }, - "ImmutabilityPolicyNameParameter": { + "ImmutabilityPolicyName": { "name": "immutabilityPolicyName", "in": "path", "required": true, diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/file.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/file.json index c453a82b1aa9..9e512e504357 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/file.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/file.json @@ -90,7 +90,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/FileServicesNameParameter" + "$ref": "#/parameters/FileServicesName" }, { "name": "parameters", @@ -142,7 +142,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/FileServicesNameParameter" + "$ref": "#/parameters/FileServicesName" } ], "responses": { @@ -1033,7 +1033,7 @@ } }, "parameters": { - "FileServicesNameParameter": { + "FileServicesName": { "name": "FileServicesName", "in": "path", "required": true, diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/queue.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/queue.json index 7b92ca73b25d..a93ec6d9a78d 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/queue.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/queue.json @@ -84,7 +84,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/QueueServiceNameParameter" + "$ref": "#/parameters/QueueServiceName" }, { "name": "parameters", @@ -136,7 +136,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/QueueServiceNameParameter" + "$ref": "#/parameters/QueueServiceName" } ], "responses": { @@ -516,7 +516,7 @@ } }, "parameters": { - "QueueServiceNameParameter": { + "QueueServiceName": { "name": "queueServiceName", "in": "path", "required": true, diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/table.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/table.json index 06947a9f632e..d819098ceeb1 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/table.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-06-01/table.json @@ -84,7 +84,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/TableServiceNameParameter" + "$ref": "#/parameters/TableServiceName" }, { "name": "parameters", @@ -136,7 +136,7 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/TableServiceNameParameter" + "$ref": "#/parameters/TableServiceName" } ], "responses": { @@ -451,7 +451,7 @@ } }, "parameters": { - "TableServiceNameParameter": { + "TableServiceName": { "name": "tableServiceName", "in": "path", "required": true,