Skip to content

Commit e81add1

Browse files
[Hub Generated] Publish private branch 'jakebillings/add-matching-resource-sync-rule' (#19034)
* add matchingResourceSyncRule to CustomLocationsFindTargetResourceGroup * matching -> matched * add missing x-ms-identifiers fields * do a better job of fixing x-ms-identifiers identifier fields
1 parent fbc7948 commit e81add1

File tree

2 files changed

+36
-9
lines changed

2 files changed

+36
-9
lines changed

specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,12 @@
801801
"type": "string"
802802
}
803803
}
804-
}
804+
},
805+
"x-ms-identifiers": [
806+
"apiVersion",
807+
"resourceType",
808+
"resourceProviderNamespace"
809+
]
805810
}
806811
}
807812
},
@@ -820,7 +825,10 @@
820825
"readOnly": true,
821826
"items": {
822827
"$ref": "#/definitions/EnabledResourceType"
823-
}
828+
},
829+
"x-ms-identifiers": [
830+
"id"
831+
]
824832
}
825833
}
826834
},
@@ -894,6 +902,11 @@
894902
"description": "The Find Target Resource Group operation response.",
895903
"type": "object",
896904
"properties": {
905+
"matchedResourceSyncRule": {
906+
"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.",
907+
"type": "string",
908+
"readOnly": true
909+
},
897910
"targetResourceGroup": {
898911
"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.",
899912
"type": "string",
@@ -916,7 +929,10 @@
916929
"readOnly": true,
917930
"items": {
918931
"$ref": "#/definitions/customLocation"
919-
}
932+
},
933+
"x-ms-identifiers": [
934+
"id"
935+
]
920936
}
921937
}
922938
},
@@ -974,10 +990,10 @@
974990
},
975991
"customLocationOperationsList": {
976992
"description": "Lists of Custom Locations operations.",
977-
"type": "object",
978993
"required": [
979994
"value"
980995
],
996+
"type": "object",
981997
"properties": {
982998
"nextLink": {
983999
"description": "Next page of operations.",
@@ -988,7 +1004,10 @@
9881004
"type": "array",
9891005
"items": {
9901006
"$ref": "#/definitions/customLocationOperation"
991-
}
1007+
},
1008+
"x-ms-identifiers": [
1009+
"name"
1010+
]
9921011
}
9931012
}
9941013
},
@@ -1020,7 +1039,10 @@
10201039
"type": "array",
10211040
"items": {
10221041
"type": "string"
1023-
}
1042+
},
1043+
"x-ms-identifiers": [
1044+
"id"
1045+
]
10241046
},
10251047
"displayName": {
10261048
"description": "Display name for the Custom Locations location.",
@@ -1077,7 +1099,8 @@
10771099
"type": "array",
10781100
"items": {
10791101
"type": "string"
1080-
}
1102+
},
1103+
"x-ms-identifiers": []
10811104
}
10821105
}
10831106
},
@@ -1161,7 +1184,10 @@
11611184
"readOnly": true,
11621185
"items": {
11631186
"$ref": "#/definitions/resourceSyncRule"
1164-
}
1187+
},
1188+
"x-ms-identifiers": [
1189+
"id"
1190+
]
11651191
}
11661192
}
11671193
},

specification/extendedlocation/resource-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/examples/CustomLocationsFindTargetResourceGroup.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"responses": {
1515
"200": {
1616
"body": {
17-
"targetResourceGroup": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/target-resource-group/"
17+
"targetResourceGroup": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/target-resource-group/",
18+
"matchedResourceSyncRule": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/testresourcegroup/providers/Microsoft.ExtendedLocation/customLocations/tesla-customlocation-1-chumpishness/resourceSyncRules/test-resource-sync-rule"
1819
}
1920
},
2021
"204": {}

0 commit comments

Comments
 (0)