Skip to content

Commit 2c0ac71

Browse files
ramoka178markcowl
authored and
JoshLove-msft
committed
MGRP S360 Vuln (Azure#22832)
* Add blockchain to latest profile * Add additional types * Fix Swagger issues * Solve validation --------- Co-authored-by: Mark Cowlishaw <[email protected]>
1 parent ef27be5 commit 2c0ac71

File tree

12 files changed

+46
-57
lines changed

12 files changed

+46
-57
lines changed

‎specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/DeleteManagementGroup.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
"type": "Microsoft.Management/managementGroups",
1212
"name": "GroupToDelete",
1313
"status": "NotStarted"
14+
},
15+
"headers": {
16+
"azure-asyncoperation": "https://management.azure.com/providers/Microsoft.Management/operationResults/delete/asyncOperation/status/managementGroups/GroupToDelete?api-version=2020-05-01"
1417
}
1518
},
1619
"204": {}

‎specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/ListHierarchySettings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
}
2020
],
21-
"nextLink": null
21+
"@nextLink": null
2222
}
2323
}
2424
}

‎specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/ListManagementGroups.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727
}
2828
],
29-
"nextLink": null
29+
"@nextLink": null
3030
}
3131
}
3232
}

‎specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/ListOperations.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"parameters": {
3+
"api-version": "2020-05-01"
4+
},
5+
"responses": {
6+
"200": {
7+
"body": {
8+
"value": [
9+
{
10+
"name": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
11+
"display": {
12+
"provider": "aaaaaaaaaaaaaaaaaaaaa",
13+
"resource": "aaaaaaaaaaaaa",
14+
"operation": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
15+
"description": "aaaaaaaaaaaaaaaaaaaaaa"
16+
}
17+
}
18+
],
19+
"nextLink": "aaaaaaaaaaaaaaaaaaa"
20+
}
21+
}
22+
}
23+
}

‎specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/management.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
}
8282
},
8383
"x-ms-pageable": {
84-
"nextLinkName": "nextLink"
84+
"nextLinkName": "@nextLink"
8585
},
8686
"x-ms-examples": {
8787
"ListManagementGroups": {
@@ -712,6 +712,11 @@
712712
},
713713
"x-ms-pageable": {
714714
"nextLinkName": "nextLink"
715+
},
716+
"x-ms-examples": {
717+
"List Operations": {
718+
"$ref": "./examples/ListOperations.json"
719+
}
715720
}
716721
}
717722
},
@@ -1059,7 +1064,7 @@
10591064
"$ref": "#/definitions/ManagementGroupInfo"
10601065
}
10611066
},
1062-
"nextLink": {
1067+
"@nextLink": {
10631068
"description": "The URL to use for getting the next set of results.",
10641069
"type": "string",
10651070
"readOnly": true
@@ -1431,7 +1436,7 @@
14311436
"$ref": "#/definitions/HierarchySettingsInfo"
14321437
}
14331438
},
1434-
"nextLink": {
1439+
"@nextLink": {
14351440
"description": "The URL to use for getting the next set of results.",
14361441
"type": "string",
14371442
"readOnly": true

‎specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/examples/GetAllSubscriptionsFromManagementGroup.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
"properties": {
1515
"displayName": "S5",
1616
"parent": {
17-
"id": "/providers/Microsoft.Management/managementGroups/Group",
18-
"name": "name",
19-
"displayName": "displayName"
17+
"id": "/providers/Microsoft.Management/managementGroups/Group"
2018
},
2119
"state": "Active",
2220
"tenant": "e751ac82-623b-4913-8d74-22637c832373"

‎specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/examples/ListHierarchySettings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
}
2020
],
21-
"nextLink": null
21+
"@nextLink": null
2222
}
2323
}
2424
}

‎specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/examples/ListManagementGroups.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727
}
2828
],
29-
"nextLink": null
29+
"@nextLink": null
3030
}
3131
}
3232
}

‎specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/management.json‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
}
8282
},
8383
"x-ms-pageable": {
84-
"nextLinkName": "nextLink"
84+
"nextLinkName": "@nextLink"
8585
},
8686
"x-ms-examples": {
8787
"ListManagementGroups": {
@@ -1070,7 +1070,7 @@
10701070
"$ref": "#/definitions/ManagementGroupInfo"
10711071
}
10721072
},
1073-
"nextLink": {
1073+
"@nextLink": {
10741074
"description": "The URL to use for getting the next set of results.",
10751075
"type": "string",
10761076
"readOnly": true
@@ -1173,7 +1173,7 @@
11731173
},
11741174
"parent": {
11751175
"title": "Parent",
1176-
"$ref": "#/definitions/ParentGroupBagInfo",
1176+
"$ref": "#/definitions/DescendantParentGroupInfo",
11771177
"x-nullable": true
11781178
},
11791179
"state": {
@@ -1450,7 +1450,7 @@
14501450
"$ref": "#/definitions/HierarchySettingsInfo"
14511451
}
14521452
},
1453-
"nextLink": {
1453+
"@nextLink": {
14541454
"description": "The URL to use for getting the next set of results.",
14551455
"type": "string",
14561456
"readOnly": true
@@ -1579,24 +1579,6 @@
15791579
}
15801580
}
15811581
},
1582-
"ParentGroupBagInfo": {
1583-
"description": "The ID, name and displayName of the parent management group.",
1584-
"type": "object",
1585-
"properties": {
1586-
"id": {
1587-
"type": "string",
1588-
"description": "The fully qualified ID for the parent management group. For example, /providers/Microsoft.Management/managementGroups/0000000-0000-0000-0000-000000000000"
1589-
},
1590-
"name": {
1591-
"type": "string",
1592-
"description": "The name of the parent management group. For example, 00000000-0000-0000-0000-000000000000"
1593-
},
1594-
"displayName": {
1595-
"type": "string",
1596-
"description": "The friendly name of the parent management group."
1597-
}
1598-
}
1599-
},
16001582
"EntityListResult": {
16011583
"description": "Describes the result of the request to view entities.",
16021584
"properties": {

‎specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/AddManagementGroupSubscription.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
"properties": {
1515
"displayName": "Group",
1616
"parent": {
17-
"id": "/providers/Microsoft.Management/managementGroups/Group",
18-
"name": "name",
19-
"displayName": "displayName"
17+
"id": "/providers/Microsoft.Management/managementGroups/Group"
2018
},
2119
"state": "Active",
2220
"tenant": "e751ac82-623b-4913-8d74-22637c832373"

0 commit comments

Comments
 (0)