Fix issues in mgmt group swaggers which result in problematic SDKs (A…

…zure#12488) * fix issue in 2020-02-01 * fix issue in 2020-05-01 * fix model validation * fix prettier * revert some removal of x-ms-parameter-location
mkarmark · Jul 20, 2021 · f30757b · f30757b
1 parent 6792b75
commit f30757b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 43 deletions.
diff --git a/...esource-manager/Microsoft.Management/stable/2020-02-01/examples/PatchManagementGroup.json b/...esource-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/.../resource-manager/Microsoft.Management/stable/2020-02-01/examples/PutManagementGroup.json b/.../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"
+          }
         }
       }
     },

diff --git a/.../managementgroups/resource-manager/Microsoft.Management/stable/2020-02-01/management.json b/.../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"
               }
             ]
           },
@@ -1855,7 +1855,7 @@
       "schema": {
         "$ref": "#/definitions/CreateManagementGroupRequest"
       },
-      "x-ms-parameter-location": "client"
+      "x-ms-parameter-location": "method"
     },
     "PatchGroupRequestParameter": {
       "name": "patchGroupRequest",
@@ -1865,7 +1865,7 @@
       "schema": {
         "$ref": "#/definitions/PatchManagementGroupRequest"
       },
-      "x-ms-parameter-location": "client"
+      "x-ms-parameter-location": "method"
     },
     "FilterParameter": {
       "name": "$filter",
@@ -1922,19 +1922,7 @@
       "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"
+      "x-ms-parameter-location": "method"
     },
     "CheckNameAvailabilityParameter": {
       "name": "checkNameAvailabilityRequest",
@@ -1944,31 +1932,31 @@
       "schema": {
         "$ref": "#/definitions/CheckNameAvailabilityRequest"
       },
-      "x-ms-parameter-location": "client"
+      "x-ms-parameter-location": "method"
     },
     "SkipParameter": {
       "name": "$skip",
       "in": "query",
       "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",
       "in": "query",
       "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",
       "in": "query",
       "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",

diff --git a/.../managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/management.json b/.../managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/management.json
@@ -1971,7 +1971,7 @@
       "schema": {
         "$ref": "#/definitions/CreateManagementGroupRequest"
       },
-      "x-ms-parameter-location": "client"
+      "x-ms-parameter-location": "method"
     },
     "PatchGroupRequestParameter": {
       "name": "patchGroupRequest",
@@ -1981,7 +1981,7 @@
       "schema": {
         "$ref": "#/definitions/PatchManagementGroupRequest"
       },
-      "x-ms-parameter-location": "client"
+      "x-ms-parameter-location": "method"
     },
     "FilterParameter": {
       "name": "$filter",
@@ -2038,19 +2038,7 @@
       "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"
+      "x-ms-parameter-location": "method"
     },
     "CheckNameAvailabilityParameter": {
       "name": "checkNameAvailabilityRequest",
@@ -2060,31 +2048,31 @@
       "schema": {
         "$ref": "#/definitions/CheckNameAvailabilityRequest"
       },
-      "x-ms-parameter-location": "client"
+      "x-ms-parameter-location": "method"
     },
     "SkipParameter": {
       "name": "$skip",
       "in": "query",
       "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",
       "in": "query",
       "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",
       "in": "query",
       "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",