CodeGen from PR 11821 in Azure/azure-rest-api-specs

Merge 60dd15a6f5da6c9d0b1e32559885eb6a05f57c9b into 171eb5562c1d2e86eb0658923c54860cb25c8379
AzureSDKAutomation · Dec 1, 2020 · 5dafb49 · 5dafb49
1 parent 3b31cef
commit 5dafb49
Show file tree

Hide file tree

Showing 5 changed files with 1,143 additions and 12 deletions.
diff --git a/schemas/2014-04-01-preview/deploymentTemplate.json b/schemas/2014-04-01-preview/deploymentTemplate.json
@@ -1843,6 +1843,8 @@
                   { "$ref": "https://schema.management.azure.com/schemas/2019-10-01/Microsoft.Migrate.json#/resourceDefinitions/assessmentProjects_groups_assessments" },
                   { "$ref": "https://schema.management.azure.com/schemas/2019-10-01/Microsoft.Migrate.json#/resourceDefinitions/assessmentProjects_hypervcollectors" },
                   { "$ref": "https://schema.management.azure.com/schemas/2019-10-01/Microsoft.Migrate.json#/resourceDefinitions/assessmentProjects_vmwarecollectors" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Migrate.json#/resourceDefinitions/moveCollections" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Migrate.json#/resourceDefinitions/moveCollections_moveResources" },
                   { "$ref": "https://schema.management.azure.com/schemas/2019-03-01/Microsoft.Insights.json#/resourceDefinitions/actionGroups" },
                   { "$ref": "https://schema.management.azure.com/schemas/2018-06-01-preview/Microsoft.ManagedServices.json#/resourceDefinitions/registrationAssignments" },
                   { "$ref": "https://schema.management.azure.com/schemas/2018-06-01-preview/Microsoft.ManagedServices.json#/resourceDefinitions/registrationDefinitions" },

diff --git a/schemas/2018-09-01-preview/Microsoft.Attestation.json b/schemas/2018-09-01-preview/Microsoft.Attestation.json
@@ -15,11 +15,19 @@
         },
         "location": {
           "type": "string",
-          "description": "The supported Azure location where the attestation service instance should be created."
+          "description": "The supported Azure location where the attestation provider should be created."
         },
         "name": {
-          "type": "string",
-          "description": "Name of the attestation service instance."
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[a-zA-Z0-9-]{3,24}$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Name of the attestation provider."
         },
         "properties": {
           "oneOf": [
@@ -45,7 +53,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The tags that will be assigned to the attestation service instance."
+          "description": "The tags that will be assigned to the attestation provider."
         },
         "type": {
           "type": "string",
@@ -194,4 +202,4 @@
       }
     }
   }
-}
+}