From 1965df59d99ee8f4c7eb550f8e76be26cd1e5224 Mon Sep 17 00:00:00 2001 From: Jake Billings Date: Mon, 9 May 2022 08:46:21 -0700 Subject: [PATCH 1/4] add matchingResourceSyncRule to CustomLocationsFindTargetResourceGroup --- .../preview/2021-08-31-preview/customlocations.json | 10 +++++++--- .../CustomLocationsFindTargetResourceGroup.json | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json b/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json index 346b0ef3365b..e76758867e7c 100644 --- a/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json +++ b/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json @@ -894,6 +894,11 @@ "description": "The Find Target Resource Group operation response.", "type": "object", "properties": { + "matchingResourceSyncRule": { + "description": "The matching resource sync rule is the particular resource sync rule that matched the match expressions and labels and had lowest priority. This is the rule responsible for mapping the target resource to the target resource group.", + "type": "string", + "readOnly": true + }, "targetResourceGroup": { "description": "The target resource group of matching resource sync rule. The labels from the request will be used to find out matching resource sync rule against the selector property of the resource sync rule. The one with highest priority will be returned if there are multiple matching rules.", "type": "string", @@ -974,10 +979,10 @@ }, "customLocationOperationsList": { "description": "Lists of Custom Locations operations.", - "type": "object", "required": [ "value" ], + "type": "object", "properties": { "nextLink": { "description": "Next page of operations.", @@ -1057,8 +1062,7 @@ "items": { "$ref": "#/definitions/matchExpressionsProperties", "description": "The list of matchExpressions." - }, - "x-ms-identifiers": [] + } }, "matchExpressionsProperties": { "description": "Resource Sync Rules matchExpression property definition.", diff --git a/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/examples/CustomLocationsFindTargetResourceGroup.json b/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/examples/CustomLocationsFindTargetResourceGroup.json index ff246f118a71..484039a082ac 100644 --- a/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/examples/CustomLocationsFindTargetResourceGroup.json +++ b/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/examples/CustomLocationsFindTargetResourceGroup.json @@ -14,7 +14,8 @@ "responses": { "200": { "body": { - "targetResourceGroup": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/target-resource-group/" + "targetResourceGroup": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/target-resource-group/", + "matchingResourceSyncRule": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/testresourcegroup/providers/Microsoft.ExtendedLocation/customLocations/tesla-customlocation-1-chumpishness/resourceSyncRules/test-resource-sync-rule" } }, "204": {} From bf103dad7f94d493fe6887219608f710a65616c8 Mon Sep 17 00:00:00 2001 From: Jake Billings Date: Mon, 9 May 2022 09:49:48 -0700 Subject: [PATCH 2/4] matching -> matched --- .../preview/2021-08-31-preview/customlocations.json | 2 +- .../examples/CustomLocationsFindTargetResourceGroup.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json b/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json index e76758867e7c..135baa50cb90 100644 --- a/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json +++ b/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json @@ -894,7 +894,7 @@ "description": "The Find Target Resource Group operation response.", "type": "object", "properties": { - "matchingResourceSyncRule": { + "matchedResourceSyncRule": { "description": "The matching resource sync rule is the particular resource sync rule that matched the match expressions and labels and had lowest priority. This is the rule responsible for mapping the target resource to the target resource group.", "type": "string", "readOnly": true diff --git a/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/examples/CustomLocationsFindTargetResourceGroup.json b/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/examples/CustomLocationsFindTargetResourceGroup.json index 484039a082ac..4a330bddf593 100644 --- a/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/examples/CustomLocationsFindTargetResourceGroup.json +++ b/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/examples/CustomLocationsFindTargetResourceGroup.json @@ -15,7 +15,7 @@ "200": { "body": { "targetResourceGroup": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/target-resource-group/", - "matchingResourceSyncRule": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/testresourcegroup/providers/Microsoft.ExtendedLocation/customLocations/tesla-customlocation-1-chumpishness/resourceSyncRules/test-resource-sync-rule" + "matchedResourceSyncRule": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/testresourcegroup/providers/Microsoft.ExtendedLocation/customLocations/tesla-customlocation-1-chumpishness/resourceSyncRules/test-resource-sync-rule" } }, "204": {} From 3e43c157bc242ad903d1d21e1dec9f3ef24b3da9 Mon Sep 17 00:00:00 2001 From: Jake Billings Date: Mon, 9 May 2022 10:27:51 -0700 Subject: [PATCH 3/4] add missing x-ms-identifiers fields --- .../preview/2021-08-31-preview/customlocations.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json b/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json index 135baa50cb90..66ccdff2efb2 100644 --- a/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json +++ b/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json @@ -801,7 +801,10 @@ "type": "string" } } - } + }, + "x-ms-identifiers": [ + "id" + ] } } }, @@ -993,7 +996,10 @@ "type": "array", "items": { "$ref": "#/definitions/customLocationOperation" - } + }, + "x-ms-identifiers": [ + "id" + ] } } }, From 3873c01adf26765e0775255d2d45584e530f5a31 Mon Sep 17 00:00:00 2001 From: Jake Billings Date: Mon, 9 May 2022 11:21:05 -0700 Subject: [PATCH 4/4] do a better job of fixing x-ms-identifiers identifier fields --- .../2021-08-31-preview/customlocations.json | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json b/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json index 66ccdff2efb2..f0761c7e8065 100644 --- a/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json +++ b/specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json @@ -803,7 +803,9 @@ } }, "x-ms-identifiers": [ - "id" + "apiVersion", + "resourceType", + "resourceProviderNamespace" ] } } @@ -823,7 +825,10 @@ "readOnly": true, "items": { "$ref": "#/definitions/EnabledResourceType" - } + }, + "x-ms-identifiers": [ + "id" + ] } } }, @@ -924,7 +929,10 @@ "readOnly": true, "items": { "$ref": "#/definitions/customLocation" - } + }, + "x-ms-identifiers": [ + "id" + ] } } }, @@ -998,7 +1006,7 @@ "$ref": "#/definitions/customLocationOperation" }, "x-ms-identifiers": [ - "id" + "name" ] } } @@ -1031,7 +1039,10 @@ "type": "array", "items": { "type": "string" - } + }, + "x-ms-identifiers": [ + "id" + ] }, "displayName": { "description": "Display name for the Custom Locations location.", @@ -1068,7 +1079,8 @@ "items": { "$ref": "#/definitions/matchExpressionsProperties", "description": "The list of matchExpressions." - } + }, + "x-ms-identifiers": [] }, "matchExpressionsProperties": { "description": "Resource Sync Rules matchExpression property definition.", @@ -1087,7 +1099,8 @@ "type": "array", "items": { "type": "string" - } + }, + "x-ms-identifiers": [] } } }, @@ -1171,7 +1184,10 @@ "readOnly": true, "items": { "$ref": "#/definitions/resourceSyncRule" - } + }, + "x-ms-identifiers": [ + "id" + ] } } },