MGRP S360 Vuln (#22832)

* Add blockchain to latest profile * Add additional types * Fix Swagger issues * Solve validation --------- Co-authored-by: Mark Cowlishaw <markcowl@microsoft.com>
Azure · Apr 6, 2023 · 7ef6c70 · 7ef6c70
1 parent 9a46bdb
commit 7ef6c70
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 57 deletions.
diff --git a/...source-manager/Microsoft.Management/stable/2020-05-01/examples/DeleteManagementGroup.json b/...source-manager/Microsoft.Management/stable/2020-05-01/examples/DeleteManagementGroup.json
@@ -11,6 +11,9 @@
         "type": "Microsoft.Management/managementGroups",
         "name": "GroupToDelete",
         "status": "NotStarted"
+      },
+      "headers": {
+        "azure-asyncoperation": "https://management.azure.com/providers/Microsoft.Management/operationResults/delete/asyncOperation/status/managementGroups/GroupToDelete?api-version=2020-05-01"
       }
     },
     "204": {}

diff --git a/...source-manager/Microsoft.Management/stable/2020-05-01/examples/ListHierarchySettings.json b/...source-manager/Microsoft.Management/stable/2020-05-01/examples/ListHierarchySettings.json
@@ -18,7 +18,7 @@
             }
           }
         ],
-        "nextLink": null
+        "@nextLink": null
       }
     }
   }

diff --git a/...esource-manager/Microsoft.Management/stable/2020-05-01/examples/ListManagementGroups.json b/...esource-manager/Microsoft.Management/stable/2020-05-01/examples/ListManagementGroups.json
@@ -26,7 +26,7 @@
             }
           }
         ],
-        "nextLink": null
+        "@nextLink": null
       }
     }
   }

diff --git a/...oups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/ListOperations.json b/...oups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/ListOperations.json
@@ -0,0 +1,23 @@
+{
+  "parameters": {
+    "api-version": "2020-05-01"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "name": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+            "display": {
+              "provider": "aaaaaaaaaaaaaaaaaaaaa",
+              "resource": "aaaaaaaaaaaaa",
+              "operation": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+              "description": "aaaaaaaaaaaaaaaaaaaaaa"
+            }
+          }
+        ],
+        "nextLink": "aaaaaaaaaaaaaaaaaaa"
+      }
+    }
+  }
+}
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
@@ -81,7 +81,7 @@
           }
         },
         "x-ms-pageable": {
-          "nextLinkName": "nextLink"
+          "nextLinkName": "@nextLink"
         },
         "x-ms-examples": {
           "ListManagementGroups": {
@@ -712,6 +712,11 @@
         },
         "x-ms-pageable": {
           "nextLinkName": "nextLink"
+        },
+        "x-ms-examples": {
+          "List Operations": {
+            "$ref": "./examples/ListOperations.json"
+          }
         }
       }
     },
@@ -1059,7 +1064,7 @@
             "$ref": "#/definitions/ManagementGroupInfo"
           }
         },
-        "nextLink": {
+        "@nextLink": {
           "description": "The URL to use for getting the next set of results.",
           "type": "string",
           "readOnly": true
@@ -1431,7 +1436,7 @@
             "$ref": "#/definitions/HierarchySettingsInfo"
           }
         },
-        "nextLink": {
+        "@nextLink": {
           "description": "The URL to use for getting the next set of results.",
           "type": "string",
           "readOnly": true

diff --git a/...crosoft.Management/stable/2020-10-01/examples/GetAllSubscriptionsFromManagementGroup.json b/...crosoft.Management/stable/2020-10-01/examples/GetAllSubscriptionsFromManagementGroup.json
@@ -14,9 +14,7 @@
             "properties": {
               "displayName": "S5",
               "parent": {
-                "id": "/providers/Microsoft.Management/managementGroups/Group",
-                "name": "name",
-                "displayName": "displayName"
+                "id": "/providers/Microsoft.Management/managementGroups/Group"
               },
               "state": "Active",
               "tenant": "e751ac82-623b-4913-8d74-22637c832373"

diff --git a/...source-manager/Microsoft.Management/stable/2020-10-01/examples/ListHierarchySettings.json b/...source-manager/Microsoft.Management/stable/2020-10-01/examples/ListHierarchySettings.json
@@ -18,7 +18,7 @@
             }
           }
         ],
-        "nextLink": null
+        "@nextLink": null
       }
     }
   }

diff --git a/...esource-manager/Microsoft.Management/stable/2020-10-01/examples/ListManagementGroups.json b/...esource-manager/Microsoft.Management/stable/2020-10-01/examples/ListManagementGroups.json
@@ -26,7 +26,7 @@
             }
           }
         ],
-        "nextLink": null
+        "@nextLink": null
       }
     }
   }

diff --git a/.../managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/management.json b/.../managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/management.json
@@ -81,7 +81,7 @@
           }
         },
         "x-ms-pageable": {
-          "nextLinkName": "nextLink"
+          "nextLinkName": "@nextLink"
         },
         "x-ms-examples": {
           "ListManagementGroups": {
@@ -1070,7 +1070,7 @@
             "$ref": "#/definitions/ManagementGroupInfo"
           }
         },
-        "nextLink": {
+        "@nextLink": {
           "description": "The URL to use for getting the next set of results.",
           "type": "string",
           "readOnly": true
@@ -1173,7 +1173,7 @@
         },
         "parent": {
           "title": "Parent",
-          "$ref": "#/definitions/ParentGroupBagInfo",
+          "$ref": "#/definitions/DescendantParentGroupInfo",
           "x-nullable": true
         },
         "state": {
@@ -1450,7 +1450,7 @@
             "$ref": "#/definitions/HierarchySettingsInfo"
           }
         },
-        "nextLink": {
+        "@nextLink": {
           "description": "The URL to use for getting the next set of results.",
           "type": "string",
           "readOnly": true
@@ -1579,24 +1579,6 @@
         }
       }
     },
-    "ParentGroupBagInfo": {
-      "description": "The ID, name and displayName of the parent management group.",
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "string",
-          "description": "The fully qualified ID for the parent management group.  For example, /providers/Microsoft.Management/managementGroups/0000000-0000-0000-0000-000000000000"
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the parent management group. For example, 00000000-0000-0000-0000-000000000000"
-        },
-        "displayName": {
-          "type": "string",
-          "description": "The friendly name of the parent management group."
-        }
-      }
-    },
     "EntityListResult": {
       "description": "Describes the result of the request to view entities.",
       "properties": {

diff --git a/...nager/Microsoft.Management/stable/2021-04-01/examples/AddManagementGroupSubscription.json b/...nager/Microsoft.Management/stable/2021-04-01/examples/AddManagementGroupSubscription.json
@@ -14,9 +14,7 @@
         "properties": {
           "displayName": "Group",
           "parent": {
-            "id": "/providers/Microsoft.Management/managementGroups/Group",
-            "name": "name",
-            "displayName": "displayName"
+            "id": "/providers/Microsoft.Management/managementGroups/Group"
           },
           "state": "Active",
           "tenant": "e751ac82-623b-4913-8d74-22637c832373"

diff --git a/...crosoft.Management/stable/2021-04-01/examples/GetAllSubscriptionsFromManagementGroup.json b/...crosoft.Management/stable/2021-04-01/examples/GetAllSubscriptionsFromManagementGroup.json
@@ -14,9 +14,7 @@
             "properties": {
               "displayName": "S5",
               "parent": {
-                "id": "/providers/Microsoft.Management/managementGroups/Group",
-                "name": "name",
-                "displayName": "displayName"
+                "id": "/providers/Microsoft.Management/managementGroups/Group"
               },
               "state": "Active",
               "tenant": "e751ac82-623b-4913-8d74-22637c832373"

diff --git a/.../managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/management.json b/.../managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/management.json
@@ -1176,7 +1176,7 @@
         },
         "parent": {
           "title": "Parent",
-          "$ref": "#/definitions/ParentGroupBagInfo",
+          "$ref": "#/definitions/DescendantParentGroupInfo",
           "x-nullable": true
         },
         "state": {
@@ -1608,24 +1608,6 @@
         }
       }
     },
-    "ParentGroupBagInfo": {
-      "description": "The ID, name and displayName of the parent management group.",
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "string",
-          "description": "The fully qualified ID for the parent management group.  For example, /providers/Microsoft.Management/managementGroups/0000000-0000-0000-0000-000000000000"
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the parent management group. For example, 00000000-0000-0000-0000-000000000000"
-        },
-        "displayName": {
-          "type": "string",
-          "description": "The friendly name of the parent management group."
-        }
-      }
-    },
     "EntityListResult": {
       "description": "Describes the result of the request to view entities.",
       "properties": {