Merge remote-tracking branch 'upstream/master'

Azure · Dec 21, 2020 · aa5e825 · aa5e825
2 parents 3099028 + 5ffa05d
commit aa5e825
Show file tree

Hide file tree

Showing 15 changed files with 1,150 additions and 21 deletions.
diff --git a/.github/comment.yml b/.github/comment.yml
@@ -8,14 +8,6 @@
       - WaitForARMFeedback
     onCheckedComments: "Hi, @${PRAuthor} your PR are labelled with <b> WaitForARMFeedback</b>. A notification email will be sent out shortly afterwards to notify ARM review board([email protected]). cc @${PRAssignee} "
 
-- rule:
-    type: checkbox
-    variables:
-      openapiHub: https://portal.azure-devex-tools.com
-    keywords:
-      - "I have reviewed the [documentation](https://aka.ms/ameonboard) for the workflow."
-    onCheckedComments: "Hi, @${PRAuthor} Thanks for your PR. I am workflow bot for review process. Here are some small tips. </br> <li> Please ensure to do self-check against checklists in first PR comment.</li> <li> PR assignee is the person auto-assigned and responsible for your current PR reviewing and merging. </li>   <li> For specs comparison cross API versions,  Use [API Specs Comparison Report Generator](${openapiHub}/tools/diff?pr=${owner}/${repo}/${PRNumber})</li>  <li> If there is CI failure(s), to fix CI error(s) is mandatory for PR merging; or you need to provide justification in PR comment for explanation. [How to fix?](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/ci-fix.md)</li></br> Any feedback about review process or workflow bot, pls contact swagger and tools team. [email protected]"
-
 - rule:
     type: label
     label: BreakingChangeReviewRequired
@@ -47,6 +39,6 @@
       openapiHub: https://openapihub.test.azure-devex-tools.com/
     keywords:
       - "I have reviewed the [documentation](https://aka.ms/ameonboard) for the workflow."
-    onOpenedComments: "Hi, @${PRAuthor} Thanks for your PR. I am workflow bot for review process. Here are some small tips. </br> <li> Please ensure to do self-check against checklists in first PR comment.</li> <li> PR assignee is the person auto-assigned and responsible for your current PR reviewing and merging. </li> <li> For cross api-version diff. See [OpenAPI Hub Diff](${openapiHub}diff?pr=${owner}/${repo}/${PRNumber})</li>  <li> If there is CI failure(s), to fix CI error(s) is mandatory for PR merging; or you need to provide justification in PR comment for explanation. [How to fix?](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/ci-fix.md)</li></br> Any feedback about review process or workflow bot, pls contact swagger and tools team. [email protected]"
+    onOpenedComments: "Hi, @${PRAuthor} Thanks for your PR. I am workflow bot for review process. Here are some small tips. </br> <li> Please ensure to do self-check against checklists in first PR comment.</li> <li> PR assignee is the person auto-assigned and responsible for your current PR reviewing and merging. </li>   <li> For specs comparison cross API versions,  Use [API Specs Comparison Report Generator](${openapiHub}/tools/diff?pr=${owner}/${repo}/${PRNumber})</li>  <li> If there is CI failure(s), to fix CI error(s) is mandatory for PR merging; or you need to provide justification in PR comment for explanation. [How to fix?](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/ci-fix.md)</li></br> Any feedback about review process or workflow bot, pls contact swagger and tools team. [email protected]"
 
 
diff --git a/...urce-manager/Microsoft.AlertsManagement/stable/2019-06-01/SmartDetectorAlertRulesApi.json b/...urce-manager/Microsoft.AlertsManagement/stable/2019-06-01/SmartDetectorAlertRulesApi.json
@@ -384,7 +384,10 @@
         },
         "tags": {
           "type": "object",
-          "description": "The resource tags."
+          "description": "The resource tags.",
+          "additionalProperties": {
+            "type": "string"
+          }
         }
       },
       "x-ms-azure-resource": true,
@@ -440,7 +443,10 @@
         },
         "tags": {
           "type": "object",
-          "description": "The resource tags."
+          "description": "The resource tags.",
+          "additionalProperties": {
+            "type": "string"
+          }
         },
         "properties": {
           "x-ms-client-flatten": true,

diff --git a/...ft.AlertsManagement/stable/2019-06-01/examples/SmartDetectorAlertRule_CreateOrUpdate.json b/...ft.AlertsManagement/stable/2019-06-01/examples/SmartDetectorAlertRule_CreateOrUpdate.json
@@ -36,7 +36,7 @@
         "type": "Microsoft.AlertsManagement/smartDetectorAlertRules",
         "name": "MyAlertRule",
         "location": "global",
-        "tags": "",
+        "tags": {},
         "properties": {
           "description": "Sample smart detector alert rule description",
           "state": "Enabled",
@@ -65,7 +65,7 @@
         "type": "Microsoft.AlertsManagement/smartDetectorAlertRules",
         "name": "MyAlertRule",
         "location": "global",
-        "tags": "",
+        "tags": {},
         "properties": {
           "description": "Sample smart detector alert rule description",
           "state": "Enabled",

diff --git a/...ger/Microsoft.AlertsManagement/stable/2019-06-01/examples/SmartDetectorAlertRule_Get.json b/...ger/Microsoft.AlertsManagement/stable/2019-06-01/examples/SmartDetectorAlertRule_Get.json
@@ -12,7 +12,7 @@
         "type": "Microsoft.AlertsManagement/smartDetectorAlertRules",
         "name": "MyAlertRule",
         "location": "global",
-        "tags": "",
+        "tags": {},
         "properties": {
           "description": "Sample smart detector alert rule description",
           "state": "Enabled",

diff --git a/...er/Microsoft.AlertsManagement/stable/2019-06-01/examples/SmartDetectorAlertRule_List.json b/...er/Microsoft.AlertsManagement/stable/2019-06-01/examples/SmartDetectorAlertRule_List.json
@@ -14,7 +14,7 @@
             "type": "Microsoft.AlertsManagement/smartDetectorAlertRules",
             "name": "MyAlertRule",
             "location": "global",
-            "tags": "",
+            "tags": {},
             "properties": {
               "description": "Sample smart detector alert rule description",
               "state": "Enabled",
@@ -41,7 +41,7 @@
             "type": "Microsoft.AlertsManagement/smartDetectorAlertRules",
             "name": "MySecondAlertRule",
             "location": "global",
-            "tags": "",
+            "tags": {},
             "properties": {
               "description": "Sample smart detector alert rule description",
               "state": "Disabled",

diff --git a/...ertsManagement/stable/2019-06-01/examples/SmartDetectorAlertRule_ListByResourceGroup.json b/...ertsManagement/stable/2019-06-01/examples/SmartDetectorAlertRule_ListByResourceGroup.json
@@ -14,7 +14,7 @@
             "type": "Microsoft.AlertsManagement/smartDetectorAlertRules",
             "name": "MyAlertRule",
             "location": "global",
-            "tags": "",
+            "tags": {},
             "properties": {
               "description": "Sample smart detector alert rule description",
               "state": "Enabled",
@@ -41,7 +41,7 @@
             "type": "Microsoft.AlertsManagement/smartDetectorAlertRules",
             "name": "MySecondAlertRule",
             "location": "global",
-            "tags": "",
+            "tags": {},
             "properties": {
               "description": "Sample smart detector alert rule description",
               "state": "Disabled",

diff --git a/...veryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/bms.json b/...veryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/bms.json
@@ -2858,6 +2858,13 @@
         "recoveryPointDiskConfiguration": {
           "$ref": "#/definitions/RecoveryPointDiskConfiguration",
           "description": "Disk configuration"
+        },
+        "zones": {
+          "description": "Identifies the zone of the VM at the time of backup. Applicable only for zone-pinned Vms",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
         }
       },
       "x-ms-discriminator-value": "IaasVMRecoveryPoint"
@@ -2953,6 +2960,13 @@
         "diskEncryptionSetId": {
           "description": "DiskEncryptionSet's ID - needed if the VM needs to be encrypted at rest during restore with customer managed key.",
           "type": "string"
+        },
+        "zones": {
+          "description": "Target zone where the VM and its disks should be restored.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
         }
       },
       "x-ms-discriminator-value": "IaasVMRestoreRequest"

diff --git a/...icrosoft.RecoveryServices/stable/2018-12-20/examples/AzureIaasVm/RecoveryPoints_List.json b/...icrosoft.RecoveryServices/stable/2018-12-20/examples/AzureIaasVm/RecoveryPoints_List.json
@@ -63,7 +63,10 @@
               ],
               "isManagedVirtualMachine": true,
               "virtualMachineSize": "Standard_D1",
-              "originalStorageAccountOption": false
+              "originalStorageAccountOption": false,
+              "zones": [
+                "1"
+              ]
             }
           }
         ],

diff --git a/...coveryServices/stable/2018-12-20/examples/AzureIaasVm/TriggerCrossRegionRestore_Post.json b/...coveryServices/stable/2018-12-20/examples/AzureIaasVm/TriggerCrossRegionRestore_Post.json
@@ -41,7 +41,10 @@
         "targetDomainNameId": null,
         "targetResourceGroupId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAckl",
         "targetVirtualMachineId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAckl/providers/Microsoft.Compute/virtualMachines/gaallaVM",
-        "virtualNetworkId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAcklVaultCCY/providers/Microsoft.Network/virtualNetworks/00networkAcklVaultCCY-vnet"
+        "virtualNetworkId": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/00networkAcklVaultCCY/providers/Microsoft.Network/virtualNetworks/00networkAcklVaultCCY-vnet",
+        "zones": [
+          "2"
+        ]
       }
     }
   },