Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Hub Generated] Publish private branch 'jakebillings/add-matching-resource-sync-rule' #19034

Merged
merged 4 commits into from
May 24, 2022
Merged

[Hub Generated] Publish private branch 'jakebillings/add-matching-resource-sync-rule' #19034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1965df5
add matchingResourceSyncRule to CustomLocationsFindTargetResourceGroup
jake-billings May 9, 2022
bf103da
matching -> matched
jake-billings May 9, 2022
3e43c15
add missing x-ms-identifiers fields
jake-billings May 9, 2022
3873c01
do a better job of fixing x-ms-identifiers identifier fields
jake-billings May 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 34 additions & 8 deletions ...source-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,12 @@
"type": "string"
}
}
}
},
"x-ms-identifiers": [
"apiVersion",
"resourceType",
"resourceProviderNamespace"
]
}
}
},
Expand All @@ -820,7 +825,10 @@
"readOnly": true,
"items": {
"$ref": "#/definitions/EnabledResourceType"
}
},
"x-ms-identifiers": [
"id"
]
}
}
},
Expand Down Expand Up @@ -894,6 +902,11 @@
"description": "The Find Target Resource Group operation response.",
"type": "object",
"properties": {
"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
},
"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",
Expand All @@ -916,7 +929,10 @@
"readOnly": true,
"items": {
"$ref": "#/definitions/customLocation"
}
},
"x-ms-identifiers": [
"id"
]
}
}
},
Expand Down Expand Up @@ -974,10 +990,10 @@
},
"customLocationOperationsList": {
"description": "Lists of Custom Locations operations.",
"type": "object",
"required": [
"value"
],
"type": "object",
"properties": {
"nextLink": {
"description": "Next page of operations.",
Expand All @@ -988,7 +1004,10 @@
"type": "array",
"items": {
"$ref": "#/definitions/customLocationOperation"
}
},
"x-ms-identifiers": [
"name"
]
}
}
},
Expand Down Expand Up @@ -1020,7 +1039,10 @@
"type": "array",
"items": {
"type": "string"
}
},
"x-ms-identifiers": [
"id"
]
},
"displayName": {
"description": "Display name for the Custom Locations location.",
Expand Down Expand Up @@ -1077,7 +1099,8 @@
"type": "array",
"items": {
"type": "string"
}
},
"x-ms-identifiers": []
}
}
},
Expand Down Expand Up @@ -1161,7 +1184,10 @@
"readOnly": true,
"items": {
"$ref": "#/definitions/resourceSyncRule"
}
},
"x-ms-identifiers": [
"id"
]
}
}
},
Expand Down
3 changes: 2 additions & 1 deletion ...dLocation/preview/2021-08-31-preview/examples/CustomLocationsFindTargetResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/",
"matchedResourceSyncRule": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/testresourcegroup/providers/Microsoft.ExtendedLocation/customLocations/tesla-customlocation-1-chumpishness/resourceSyncRules/test-resource-sync-rule"
}
},
"204": {}
Expand Down