[Hub Generated] Publish private branch 'jakebillings/add-matching-res…

…ource-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
Azure · May 26, 2022 · 3e42912 · 3e42912
1 parent 08d1c11
commit 3e42912
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 9 deletions.
diff --git a/...source-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json b/...source-manager/Microsoft.ExtendedLocation/preview/2021-08-31-preview/customlocations.json
@@ -801,7 +801,12 @@
                 "type": "string"
               }
             }
-          }
+          },
+          "x-ms-identifiers": [
+            "apiVersion",
+            "resourceType",
+            "resourceProviderNamespace"
+          ]
         }
       }
     },
@@ -820,7 +825,10 @@
           "readOnly": true,
           "items": {
             "$ref": "#/definitions/EnabledResourceType"
-          }
+          },
+          "x-ms-identifiers": [
+            "id"
+          ]
         }
       }
     },
@@ -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",
@@ -916,7 +929,10 @@
           "readOnly": true,
           "items": {
             "$ref": "#/definitions/customLocation"
-          }
+          },
+          "x-ms-identifiers": [
+            "id"
+          ]
         }
       }
     },
@@ -974,10 +990,10 @@
     },
     "customLocationOperationsList": {
       "description": "Lists of Custom Locations operations.",
-      "type": "object",
       "required": [
         "value"
       ],
+      "type": "object",
       "properties": {
         "nextLink": {
           "description": "Next page of operations.",
@@ -988,7 +1004,10 @@
           "type": "array",
           "items": {
             "$ref": "#/definitions/customLocationOperation"
-          }
+          },
+          "x-ms-identifiers": [
+            "name"
+          ]
         }
       }
     },
@@ -1020,7 +1039,10 @@
           "type": "array",
           "items": {
             "type": "string"
-          }
+          },
+          "x-ms-identifiers": [
+            "id"
+          ]
         },
         "displayName": {
           "description": "Display name for the Custom Locations location.",
@@ -1077,7 +1099,8 @@
           "type": "array",
           "items": {
             "type": "string"
-          }
+          },
+          "x-ms-identifiers": []
         }
       }
     },
@@ -1161,7 +1184,10 @@
           "readOnly": true,
           "items": {
             "$ref": "#/definitions/resourceSyncRule"
-          }
+          },
+          "x-ms-identifiers": [
+            "id"
+          ]
         }
       }
     },

diff --git a/...dLocation/preview/2021-08-31-preview/examples/CustomLocationsFindTargetResourceGroup.json b/...dLocation/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/",
+        "matchedResourceSyncRule": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/testresourcegroup/providers/Microsoft.ExtendedLocation/customLocations/tesla-customlocation-1-chumpishness/resourceSyncRules/test-resource-sync-rule"
       }
     },
     "204": {}