From 94d6e1c0fe0d4d6668e72d6697a293155f8c1eb9 Mon Sep 17 00:00:00 2001 From: Arcturus Zhang Date: Tue, 19 Jan 2021 16:42:19 +0800 Subject: [PATCH 1/5] fix issue in 2020-02-01 --- .../stable/2020-02-01/management.json | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/management.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/management.json index 1506d1e38eb9..33098a10b8f0 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/management.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/management.json @@ -1854,8 +1854,7 @@ "description": "Management group creation parameters.", "schema": { "$ref": "#/definitions/CreateManagementGroupRequest" - }, - "x-ms-parameter-location": "client" + } }, "PatchGroupRequestParameter": { "name": "patchGroupRequest", @@ -1864,8 +1863,7 @@ "description": "Management group patch parameters.", "schema": { "$ref": "#/definitions/PatchManagementGroupRequest" - }, - "x-ms-parameter-location": "client" + } }, "FilterParameter": { "name": "$filter", @@ -1921,8 +1919,7 @@ "description": "Tenant level settings request parameter.", "schema": { "$ref": "#/definitions/CreateOrUpdateSettingsRequest" - }, - "x-ms-parameter-location": "client" + } }, "OperationResultIdParameter": { "name": "operationResultId", @@ -1933,8 +1930,7 @@ "create", "delete" ], - "description": "The id of the operation result.", - "x-ms-parameter-location": "client" + "description": "The id of the operation result." }, "CheckNameAvailabilityParameter": { "name": "checkNameAvailabilityRequest", @@ -1943,8 +1939,7 @@ "description": "Management group name availability check parameters.", "schema": { "$ref": "#/definitions/CheckNameAvailabilityRequest" - }, - "x-ms-parameter-location": "client" + } }, "SkipParameter": { "name": "$skip", @@ -1952,7 +1947,7 @@ "required": false, "type": "integer", "description": "Number of entities to skip over when retrieving results. Passing this in will override $skipToken.", - "x-ms-parameter-location": "client" + "x-ms-parameter-location": "method" }, "TopParameter": { "name": "$top", @@ -1960,7 +1955,7 @@ "required": false, "type": "integer", "description": "Number of elements to return when retrieving results. Passing this in will override $skipToken.", - "x-ms-parameter-location": "client" + "x-ms-parameter-location": "method" }, "SkipTokenParameter": { "name": "$skiptoken", @@ -1968,7 +1963,7 @@ "required": false, "type": "string", "description": "Page continuation token is only used if a previous operation returned a partial result. \nIf a previous response contains a nextLink element, the value of the nextLink element will include a token parameter that specifies a starting point to use for subsequent calls.\n", - "x-ms-parameter-location": "client" + "x-ms-parameter-location": "method" }, "CacheControlHeader": { "name": "Cache-Control", From 56b37bfd450ee60ee1207431ad6fd3ebea597012 Mon Sep 17 00:00:00 2001 From: Arcturus Zhang Date: Tue, 19 Jan 2021 16:42:33 +0800 Subject: [PATCH 2/5] fix issue in 2020-05-01 --- .../stable/2020-05-01/management.json | 30 +++++-------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/management.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/management.json index 6bd779cfd16d..ecad542dbead 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/management.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/management.json @@ -1970,8 +1970,7 @@ "description": "Management group creation parameters.", "schema": { "$ref": "#/definitions/CreateManagementGroupRequest" - }, - "x-ms-parameter-location": "client" + } }, "PatchGroupRequestParameter": { "name": "patchGroupRequest", @@ -1980,8 +1979,7 @@ "description": "Management group patch parameters.", "schema": { "$ref": "#/definitions/PatchManagementGroupRequest" - }, - "x-ms-parameter-location": "client" + } }, "FilterParameter": { "name": "$filter", @@ -2037,20 +2035,7 @@ "description": "Tenant level settings request parameter.", "schema": { "$ref": "#/definitions/CreateOrUpdateSettingsRequest" - }, - "x-ms-parameter-location": "client" - }, - "OperationResultIdParameter": { - "name": "operationResultId", - "in": "path", - "required": true, - "type": "string", - "enum": [ - "create", - "delete" - ], - "description": "The id of the operation result.", - "x-ms-parameter-location": "client" + } }, "CheckNameAvailabilityParameter": { "name": "checkNameAvailabilityRequest", @@ -2059,8 +2044,7 @@ "description": "Management group name availability check parameters.", "schema": { "$ref": "#/definitions/CheckNameAvailabilityRequest" - }, - "x-ms-parameter-location": "client" + } }, "SkipParameter": { "name": "$skip", @@ -2068,7 +2052,7 @@ "required": false, "type": "integer", "description": "Number of entities to skip over when retrieving results. Passing this in will override $skipToken.", - "x-ms-parameter-location": "client" + "x-ms-parameter-location": "method" }, "TopParameter": { "name": "$top", @@ -2076,7 +2060,7 @@ "required": false, "type": "integer", "description": "Number of elements to return when retrieving results. Passing this in will override $skipToken.", - "x-ms-parameter-location": "client" + "x-ms-parameter-location": "method" }, "SkipTokenParameter": { "name": "$skiptoken", @@ -2084,7 +2068,7 @@ "required": false, "type": "string", "description": "Page continuation token is only used if a previous operation returned a partial result. \nIf a previous response contains a nextLink element, the value of the nextLink element will include a token parameter that specifies a starting point to use for subsequent calls.\n", - "x-ms-parameter-location": "client" + "x-ms-parameter-location": "method" }, "CacheControlHeader": { "name": "Cache-Control", From 1891036d4b9bee149af423b7d1a582d7e06bed35 Mon Sep 17 00:00:00 2001 From: Arcturus Zhang Date: Tue, 19 Jan 2021 17:05:04 +0800 Subject: [PATCH 3/5] fix model validation --- .../stable/2020-02-01/examples/PatchManagementGroup.json | 2 +- .../stable/2020-02-01/examples/PutManagementGroup.json | 8 +++++--- .../stable/2020-02-01/management.json | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/examples/PatchManagementGroup.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/examples/PatchManagementGroup.json index ed65e0c11419..7af7823ffb8b 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/examples/PatchManagementGroup.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/examples/PatchManagementGroup.json @@ -4,7 +4,7 @@ "groupId": "ChildGroup", "patchGroupRequest": { "displayName": "AlternateDisplayName", - "parentGroupId": "/providers/Microsoft.Management/managementGroups/AlternateRootGroup" + "parentId": "/providers/Microsoft.Management/managementGroups/AlternateRootGroup" }, "Cache-Control": "no-cache" }, diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/examples/PutManagementGroup.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/examples/PutManagementGroup.json index df6aa5c14183..e7d507d132e3 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/examples/PutManagementGroup.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/examples/PutManagementGroup.json @@ -5,8 +5,10 @@ "createManagementGroupRequest": { "properties": { "displayName": "ChildGroup", - "parent": { - "id": "/providers/Microsoft.Management/managementGroups/RootGroup" + "details": { + "parent": { + "id": "/providers/Microsoft.Management/managementGroups/RootGroup" + } } } }, @@ -43,4 +45,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/management.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/management.json index 33098a10b8f0..3a36d6e3da40 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/management.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/management.json @@ -1787,14 +1787,14 @@ "type": { "type": "string", "enum": [ - "Microsoft.Management/managementGroup" + "Microsoft.Management/managementGroups" ], "x-ms-enum": { "name": "Type", "modelAsString": false, "values": [ { - "value": "Microsoft.Management/managementGroup" + "value": "Microsoft.Management/managementGroups" } ] }, From aec1a39220571bed60ab179da0d5fe37ed349e3b Mon Sep 17 00:00:00 2001 From: Arcturus Zhang Date: Sat, 30 Jan 2021 10:37:50 +0800 Subject: [PATCH 4/5] fix prettier --- .../stable/2020-02-01/examples/PutManagementGroup.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/examples/PutManagementGroup.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/examples/PutManagementGroup.json index e7d507d132e3..ddd04694841e 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/examples/PutManagementGroup.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/examples/PutManagementGroup.json @@ -45,4 +45,4 @@ } } } -} \ No newline at end of file +} From 4e39234f970fd480cf8c400042853145678ca627 Mon Sep 17 00:00:00 2001 From: Arcturus Zhang Date: Sat, 30 Jan 2021 10:55:12 +0800 Subject: [PATCH 5/5] revert some removal of x-ms-parameter-location --- .../stable/2020-02-01/management.json | 23 +++++++------------ .../stable/2020-05-01/management.json | 12 ++++++---- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/management.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/management.json index 3a36d6e3da40..360bf141c49a 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/management.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/management.json @@ -1854,7 +1854,8 @@ "description": "Management group creation parameters.", "schema": { "$ref": "#/definitions/CreateManagementGroupRequest" - } + }, + "x-ms-parameter-location": "method" }, "PatchGroupRequestParameter": { "name": "patchGroupRequest", @@ -1863,7 +1864,8 @@ "description": "Management group patch parameters.", "schema": { "$ref": "#/definitions/PatchManagementGroupRequest" - } + }, + "x-ms-parameter-location": "method" }, "FilterParameter": { "name": "$filter", @@ -1919,18 +1921,8 @@ "description": "Tenant level settings request parameter.", "schema": { "$ref": "#/definitions/CreateOrUpdateSettingsRequest" - } - }, - "OperationResultIdParameter": { - "name": "operationResultId", - "in": "path", - "required": true, - "type": "string", - "enum": [ - "create", - "delete" - ], - "description": "The id of the operation result." + }, + "x-ms-parameter-location": "method" }, "CheckNameAvailabilityParameter": { "name": "checkNameAvailabilityRequest", @@ -1939,7 +1931,8 @@ "description": "Management group name availability check parameters.", "schema": { "$ref": "#/definitions/CheckNameAvailabilityRequest" - } + }, + "x-ms-parameter-location": "method" }, "SkipParameter": { "name": "$skip", diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/management.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/management.json index ecad542dbead..c6f541ac5f51 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/management.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/management.json @@ -1970,7 +1970,8 @@ "description": "Management group creation parameters.", "schema": { "$ref": "#/definitions/CreateManagementGroupRequest" - } + }, + "x-ms-parameter-location": "method" }, "PatchGroupRequestParameter": { "name": "patchGroupRequest", @@ -1979,7 +1980,8 @@ "description": "Management group patch parameters.", "schema": { "$ref": "#/definitions/PatchManagementGroupRequest" - } + }, + "x-ms-parameter-location": "method" }, "FilterParameter": { "name": "$filter", @@ -2035,7 +2037,8 @@ "description": "Tenant level settings request parameter.", "schema": { "$ref": "#/definitions/CreateOrUpdateSettingsRequest" - } + }, + "x-ms-parameter-location": "method" }, "CheckNameAvailabilityParameter": { "name": "checkNameAvailabilityRequest", @@ -2044,7 +2047,8 @@ "description": "Management group name availability check parameters.", "schema": { "$ref": "#/definitions/CheckNameAvailabilityRequest" - } + }, + "x-ms-parameter-location": "method" }, "SkipParameter": { "name": "$skip",