Merge branch 'main' into feature/cplat-2021-11-01

.azure-pipelines/BranchProtectionForPrivateRepo.yml

@@ -1,7 +1,5 @@
 jobs:
   - job: "BranchProtectionForPrivateRepo"
-    pool:
-      vmImage: 'Ubuntu 16.04'
     condition: and(variables['PRIVATE'], eq(variables['System.PullRequest.TargetBranch'], 'main'))
     steps:
     - script: '>&2 echo "the branch is protected"'

.azure-pipelines/ShouldSendPRToMain.yml

@@ -1,7 +1,5 @@
 jobs:
   - job: "ShouldSendPRToMain"
-    pool:
-      vmImage: 'Ubuntu 16.04'
     condition: eq(variables['System.PullRequest.TargetBranch'], 'master')
     steps:
     - script: '>&2 echo "##vso[task.logissue type=error]Please edit the pull request to targeting new default branch main"'

.azure-pipelines/azure-pipelines-data-container.yml

@@ -7,7 +7,7 @@ schedules:
   always: true
 
 pool:
-  vmImage: 'Ubuntu-16.04'
+  vmImage: 'Ubuntu-20.04'
 
 variables:
   IMAGE_TAG_PREFIX: $[format('1.0.{0:HHm}', pipeline.startTime)]

.github/PULL_REQUEST_TEMPLATE.md

@@ -39,7 +39,7 @@ If any further question about AME onboarding or validation tools, please view th
 > - All removals
 
 Otherwise your PR may be subject to ARM review requirements. Complete the following:
-- [ ] Check this box if any of the following apply to the PR so that label “WaitForARMFeedback” will be added automatically to begin ARM API Review. Failure to comply may result in delays to the manifest.
+- [ ] Check this box if any of the following apply to the PR so that label "WaitForARMFeedback" will be added automatically to begin ARM API Review. Failure to comply may result in delays to the manifest.
   - Adding a new service
   - Adding new API(s)
   - Adding a new API version

.github/comment.yml

@@ -34,13 +34,13 @@
     type: label
     label: CI-FixRequiredOnFailure
     onLabeledComments: >- 
-      Hi @${PRAuthor}, Your PR has some issues. Please fix the CI sequentially by following the order of `Avocado, semantic validation, model validation, breaking change, lintDiff`. 
-      <table><tr><th>Task</th><th>How to fix</th><th>Priority</th><th>Support (Microsoft alias)</th></tr>
-      <tr><td>Avocado</td><td>[Fix-Avocado](https://github.com/Azure/avocado)</td><td>High</td><td>ruowan</td></tr>
-      <tr><td>Semantic validation</td><td>[Fix-SemanticValidation-Error](https://github.com/Azure/azure-rest-api-specs/blob/main/documentation/ci-fix.md#semantic-validation)</td><td>High</td><td>raychen, jianyxi</td></tr>
-      <tr><td>Model validation</td><td>[Fix-ModelValidation-Error](https://github.com/Azure/azure-rest-api-specs/blob/main/documentation/ci-fix.md#model-validation)</td><td>High</td><td>raychen,jianyxi</td></tr>
-      <tr><td>LintDiff</td><td>[Fix-LintDiff](https://github.com/Azure/azure-rest-api-specs/blob/main/documentation/ci-fix.md#linter-validation)</td><td>high</td><td>jianyxi, ruoxuan</td></tr></table> 
-      If you need further help, please feedback via [swagger feedback](https://aka.ms/swaggerfeedback)." 
+      Hi @${PRAuthor}, Your PR has some issues. Please fix the CI sequentially by following the order of `Avocado, semantic validation, model validation, breaking change, lintDiff`. If you have any questions, please post your questions in this channel https://aka.ms/swaggersupport. 
+      <table><tr><th>Task</th><th>How to fix</th><th>Priority</th></tr>
+      <tr><td>Avocado</td><td>[Fix-Avocado](https://github.com/Azure/azure-rest-api-specs/blob/main/documentation/ci-fix.md#avocado)</td><td>High</td></tr>
+      <tr><td>Semantic validation</td><td>[Fix-SemanticValidation-Error](https://github.com/Azure/azure-rest-api-specs/blob/main/documentation/ci-fix.md#semantic-validation)</td><td>High</td></tr>
+      <tr><td>Model validation</td><td>[Fix-ModelValidation-Error](https://github.com/Azure/azure-rest-api-specs/blob/main/documentation/ci-fix.md#model-validation)</td><td>High</td></tr>
+      <tr><td>LintDiff</td><td>[Fix-LintDiff](https://github.com/Azure/azure-rest-api-specs/blob/main/documentation/ci-fix.md#linter-validation)</td><td>high</td></tr></table> 
+      If you need further help, please feedback via [swagger feedback](https://aka.ms/swaggerfeedback).
 
 - rule:
     type: PROpen

.github/issue_assignment.yml

@@ -1,11 +1,6 @@
 ---
-- rule:
-    booleanFilterExpression: "needs-triage"
+- rule: 
+    booleanFilterExpression: "APIStewardshipBoard-ReviewRequested"
     assignees:
-      - raych1
-      - akning-ms
-      - leni-msft
-      - ruowan
-      - jianyexi
-      - zhenglaizhang
+
 

.github/pull_request_assignment.yml

@@ -152,6 +152,14 @@
     reviewers:
       - zhenglaizhang
 
+- rule:
+    paths:
+      - "specification/videoanalyzer/resource-manager/**"
+      - "specification/cognitiveservices/resource-manager/**"
+      - "specification/dataprotection/**"
+    reviewers:
+      - xiaoxuqi-ms
+
 - rule:
     paths:
       - "documentation/**"

CODEOWNERS

@@ -20,7 +20,7 @@
 /specification/containerservice/ @yangl900
 /specification/cosmos-db/ @dmakwana @MehaKaushik @wmengmsft @shurd
 /specification/customer-insights/ @tjlvtao
-/specification/datafactory/ @shawnxzq @zhangyd2015
+/specification/datafactory/ @Frey-Wang @zhangyd2015 @davidzhaoyue
 /specification/datalake-analytics/ @ro-joowan
 /specification/datalake-store/ @ro-joowan
 /specification/datamigration/ @hitenjava
@@ -30,7 +30,7 @@
 /specification/documentdb/ @dmakwana
 /specification/domainservices/ @jihochang
 /specification/eventgrid/ @Kishp01 @ahamad-MS
-/specification/eventhub/ @v-ajnava
+/specification/eventhub/ @v-ajnava @dsouzaarun @damodaravadhani
 /specification/features/ @stankovski
 /specification/graphrbac/ @lmazuel @yugangw-msft @amarzavery
 /specification/hdinsight/ @pulkittomar @wawon-msft
@@ -59,18 +59,18 @@
 /specification/recoveryservicesbackup/ @dheerendrarathor
 /specification/recoveryservicessiterecovery/ @avneeshrai
 /specification/redis/ @siddharthchatrolams @timlovellsmith
-/specification/relay/ @sethmanheim @v-ajnava
+/specification/relay/ @v-ajnava @dsouzaarun @damodaravadhani
 /specification/resources/ @Azure/arm-template-deployments @rajshah11 @vivsriaus
 /specification/scheduler/ @pinwang81
 /specification/search/data-plane/ @brjohnstmsft @arv100kri @bleroy @AlexGhiondea @Mohit-Chakraborty
 /specification/search/resource-manager/ @abhi1509 @tjacobhi
 /specification/serialconsole/ @amitchat @craigw @asinn826
 /specification/service-map/ @daveirwin1
-/specification/servicebus/ @sazeesha @v-ajnava
+/specification/servicebus/ @v-ajnava @dsouzaarun @damodaravadhani
 /specification/servicefabric/ @juhacket @samedder
 /specification/sql/ @jamestao @ericshape @apurvans
-/specification/storage/ @jasonyang-msft @xiaonlimsft @kasobol-msft
-/specification/storage/data-plane/ @kasobol-msft @seanmcc-msft
+/specification/storage/ @jasonyang-msft @xiaonlimsft
+/specification/storage/data-plane/ @seanmcc-msft
 /specification/storageimportexport/ @leoz-ms
 /specification/storagesync/ @ankushbindlish2
 /specification/storsimple8000series/ @manaas-microsoft
@@ -85,4 +85,4 @@
 /specification/**/resource-manager/**/readme.az.md @jsntcy @qiaozha
 /specification/**/resource-manager/**/readme.cli.md @jsntcy @qiaozha
 /specification/**/resource-manager/**/readme.go.md @ArcturusZhang
-/specification/**/resource-manager/**/readme.python.md @jsntcy @msyyc @zhangyan133 @RAY-316 @00Kai0
+/specification/**/resource-manager/**/readme.python.md @msyyc @RAY-316 @BigCat20196

arm-compute/quickstart-templates/aliases.json

@@ -29,8 +29,8 @@
           },
           "openSUSE-Leap": {
             "publisher": "SUSE",
-            "offer": "openSUSE-Leap",
-            "sku": "42.3",
+            "offer": "opensuse-leap-15-3",
+            "sku": "gen2",
             "version": "latest"
           },
           "RHEL": {
@@ -41,8 +41,8 @@
           },
           "SLES": {
             "publisher": "SUSE",
-            "offer": "SLES",
-            "sku": "15",
+            "offer": "sles-15-sp3",
+            "sku": "gen2",
             "version": "latest"
           },
           "UbuntuLTS": {
@@ -53,6 +53,12 @@
           }
         },
         "Windows": {
+          "Win2022Datacenter": {
+            "publisher": "MicrosoftWindowsServer",
+            "offer": "WindowsServer",
+            "sku": "2022-Datacenter",
+            "version": "latest"
+          },
           "Win2019Datacenter": {
             "publisher": "MicrosoftWindowsServer",
             "offer": "WindowsServer",

azure-pipelines.yml

@@ -1,5 +1,8 @@
 name: "Azure OpenAPI"
 
+pool:
+  vmImage: 'Ubuntu-20.04'
+
 trigger:
   branches:
     include:
@@ -19,4 +22,4 @@ variables:
 
 jobs:
 - template: .azure-pipelines/BranchProtectionForPrivateRepo.yml
-- template: .azure-pipelines/ShouldSendPRToMain.yml
+- template: .azure-pipelines/ShouldSendPRToMain.yml

cSpell.json

@@ -834,7 +834,7 @@
             ]
         },
         {
-            "filename": "**/specification/confluent/resource-manager/Microsoft.Confluent/preview/2021-03-01-preview/confluent.json",
+            "filename": "**/specification/confluent/resource-manager/Microsoft.Confluent/preview/*/confluent.json",
             "words": [
                 "orgvalidate"
             ]
@@ -845,6 +845,12 @@
                 "Orignal",
                 "Seleted"
             ]
+        },
+        {
+            "filename": "**/specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2021-10-15/iotdps.json",
+            "words": [
+                "Messsage"
+            ]
         }
     ]
 }