From 8eb7b8e721e2c774b3d7ae33a12fbf510910d048 Mon Sep 17 00:00:00 2001 From: Ran Wang Date: Wed, 29 Apr 2020 11:54:54 -0700 Subject: [PATCH 1/5] Bug fixes: skip url encoding for ScopeParameter; add client name for userAssignedIdentities. --- .../Microsoft.Resources/stable/2019-10-01/resources.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json index 878ff9fb2431..1ef8e6c55514 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json @@ -5034,6 +5034,7 @@ }, "userAssignedIdentities": { "type": "object", + "x-ms-client-name": "IdentityUserAssignedIdentitiesValue", "additionalProperties": { "type": "object", "properties": { @@ -5818,7 +5819,8 @@ "required": true, "type": "string", "description": "The resource scope.", - "x-ms-parameter-location": "method" + "x-ms-parameter-location": "method", + "x-ms-skip-url-encoding": true }, "GroupIdParameter": { "name": "groupId", From fbc96e7b02c55ad96f49feffea54ab114c10957b Mon Sep 17 00:00:00 2001 From: Ran Wang Date: Wed, 29 Apr 2020 21:12:21 -0700 Subject: [PATCH 2/5] Pretty check fix. --- .../Microsoft.Resources/stable/2019-10-01/resources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json index 1ef8e6c55514..76b3ad069184 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json @@ -5820,7 +5820,7 @@ "type": "string", "description": "The resource scope.", "x-ms-parameter-location": "method", - "x-ms-skip-url-encoding": true + "x-ms-skip-url-encoding": true }, "GroupIdParameter": { "name": "groupId", From 4b204a07586661065087856982bc9268b2387004 Mon Sep 17 00:00:00 2001 From: Ran Wang Date: Wed, 6 May 2020 14:24:45 -0700 Subject: [PATCH 3/5] Move added client name into additionalProperties of userAssignedIdentities. --- .../Microsoft.Resources/stable/2019-10-01/resources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json index 76b3ad069184..9f211358a985 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json @@ -5034,9 +5034,9 @@ }, "userAssignedIdentities": { "type": "object", - "x-ms-client-name": "IdentityUserAssignedIdentitiesValue", "additionalProperties": { "type": "object", + "x-ms-client-name": "IdentityUserAssignedIdentitiesValue", "properties": { "principalId": { "readOnly": true, From e34475c6af2edbd261955ea916330f22e9d0e669 Mon Sep 17 00:00:00 2001 From: Ran Wang Date: Fri, 12 Jun 2020 02:22:58 -0700 Subject: [PATCH 4/5] Added x-ms-enum property for tag patch operation. --- .../stable/2019-10-01/resources.json | 20 ++++++++++++++++++- .../stable/2020-06-01/resources.json | 20 ++++++++++++++++++- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json index 399946292489..d232bb99b683 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json @@ -5784,7 +5784,25 @@ "Replace", "Merge", "Delete" - ] + ], + "x-ms-enum": { + "name": "operation", + "modelAsString": false, + "values": [ + { + "value": "Replace", + "description": "The 'replace' option replaces the entire set of existing tags with a new set." + }, + { + "value": "Merge", + "description": "The 'merge' option allows adding tags with new names and updating the values of tags with existing names." + }, + { + "value": "Delete", + "description": "The 'delete' option allows selectively deleting tags based on given names or name/value pairs." + } + ] + } }, "properties": { "$ref": "#/definitions/Tags", diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2020-06-01/resources.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2020-06-01/resources.json index ff07635dde6f..6f3588d3af47 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2020-06-01/resources.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2020-06-01/resources.json @@ -5805,7 +5805,25 @@ "Replace", "Merge", "Delete" - ] + ], + "x-ms-enum": { + "name": "operation", + "modelAsString": false, + "values": [ + { + "value": "Replace", + "description": "The 'replace' option replaces the entire set of existing tags with a new set." + }, + { + "value": "Merge", + "description": "The 'merge' option allows adding tags with new names and updating the values of tags with existing names." + }, + { + "value": "Delete", + "description": "The 'delete' option allows selectively deleting tags based on given names or name/value pairs." + } + ] + } }, "properties": { "$ref": "#/definitions/Tags", From f9ad433aac26b16965478d9db62a0c82703800ce Mon Sep 17 00:00:00 2001 From: Ran Wang Date: Thu, 16 Jul 2020 17:29:04 -0700 Subject: [PATCH 5/5] Set modelAsString to true for TagsPatch Enum operations. --- .../Microsoft.Resources/stable/2019-10-01/resources.json | 2 +- .../Microsoft.Resources/stable/2020-06-01/resources.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json index e6fbbac14297..64763dca9c3a 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json @@ -5931,7 +5931,7 @@ ], "x-ms-enum": { "name": "operation", - "modelAsString": false, + "modelAsString": true, "values": [ { "value": "Replace", diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2020-06-01/resources.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2020-06-01/resources.json index 9e719622976e..46af7f8d08fc 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2020-06-01/resources.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2020-06-01/resources.json @@ -5962,7 +5962,7 @@ ], "x-ms-enum": { "name": "operation", - "modelAsString": false, + "modelAsString": true, "values": [ { "value": "Replace",