merge code

.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

@@ -21,7 +21,7 @@
       - Azure/azure-rest-api-specs-pr
     variables:
       openapiHub: https://portal.azure-devex-tools.com
-      to: Azure/azure-rest-api-specs/master
+      to: Azure/azure-rest-api-specs/main
     label: Approved-OkToMerge
     onLabeledComments: "Hi @${PRAuthor},Your PR is approved. Congratulations. </br>  <li> Since your PR is in private repo (azure-rest-api-specs-pr),  there won’t be PR merge. If you want to publish the PR to public repo (Azure/azure-rest-api-specs) and get it merged, pls use [OpenAPIHub Publish PR](${openapiHub}/tools/publishpullrequest?pr=${owner}/${repo}/${PRNumber}&to=${to}).</li> <li> For further guidance on how to proceed.  Please refer to this [wiki](https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/205/RP-Scenarios-to-Contribute-to-Swagger?anchor=**public-repository-vs.-private-repository**)</li>"
 
@@ -34,21 +34,21 @@
     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/master/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/master/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/master/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
     variables:
       openapiHub: https://portal.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 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]"
+    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/main/documentation/ci-fix.md)</li></br> Any feedback about review process or workflow bot, pls contact swagger and tools team. [email protected]"
 
 - 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

@@ -54,6 +54,7 @@
       - "specification/network/**"
     reviewers:
       - lirenhe
+      - raych1
 
 
 - rule:
@@ -68,7 +69,7 @@
 
 
 - rule:
-    paths: "specification/@(resources|powerplatform|appplatform|deviceupdate)/**"
+    paths: "specification/@(resources|powerplatform|appplatform|deviceupdate|servicelinker)/**"
     reviewers:
       - raych1
 
@@ -95,7 +96,6 @@
     paths: "specification/compute/**"
     reviewers:
       - ArcturusZhang
-      - yungezz
 
 - rule:
     paths:
@@ -146,18 +146,20 @@
     reviewers:
       - weidongxu-microsoft
 
-- rule:
-    paths:
-      - "specification/servicelinker/**"
-    reviewers:
-      - raych1
-
 - rule:
     paths:
       - "specification/keyvault/**"
     reviewers:
       - zhenglaizhang
 
+- rule:
+    paths:
+      - "specification/videoanalyzer/resource-manager/**"
+      - "specification/cognitiveservices/resource-manager/**"
+      - "specification/dataprotection/**"
+    reviewers:
+      - xiaoxuqi-ms
+
 - rule:
     paths:
       - "documentation/**"
@@ -195,4 +197,5 @@
       - chunyu3
       - changlong-liu
       - msyyc
-      - qwordy
+      - qiaozha
+      - weidong

.github/sla.yml

@@ -13,21 +13,6 @@
       cc:
         - ${AUTHOR}
 
-- scheduleTask:
-    action: sendEmail
-    scope: pull_request
-    name: "send email to swagger reviewer"
-    trigger:
-      - time
-    args:
-      booleanFilterExpression: "!(NotReadyForReview||Reviewed-ChangesRequired||WaitForARMFeedback||WaitForARMRevisit||Approved-OkToMerge||(DoNotMerge&&(ARMSignedOff||Approved)))"
-      limit: 48h
-      message: '<p>Dear Swagger reviewer,</p><p>The PR ${URL} requires your attention. You receive the email either because PR author put on the label "WaitForReviewVisit", or because the PR has not been updated for over 48 hours.</p><p>The PR labeled with ${LABELS}</p><p>Quick info.</p><ul><li>If it requires responses from ARM review board, please send email to <a href="mailto:[email protected]">[email protected]</a>.</li><li>If it requires immediate ARM review, please get ARM review oncall contact point from ICM <a href="https://icm.ad.msft.net/imp/v3/oncall/current">https://icm.ad.msft.net/imp/v3/oncall/current</a> under Service "Azure Resource Manager" and Team "RP Manifest Approvers".</li><li>If it is data plane API and requires responses from &nbsp;Azure API review board, please send email to <a href="mailto:[email protected]">[email protected]</a>.</li><li>Pls refer to <a href="https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/212/Swagger-PR-Review">https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/212/Swagger-PR-Review</a>&nbsp;for more about Swagger review process.</li></ul><p><em>DO NOT REPLY: This is an automated email. If you have any questions, please send an email to the Swagger and Tools Team ([email protected]).</em></p><p>Best regards,</p><p>Swagger and Tools Team, Azure Management Experience</p>'
-      subject: "Action Required: Please respond to the PR ${URL}"
-      to: ${ASSIGNEE}
-      cc:
-        - ${AUTHOR}
-
 - scheduleTask:
     action: sendEmail
     scope: pull_request
@@ -99,3 +84,18 @@
       to: ${AUTHOR}
       cc:
         - [email protected]
+
+- scheduleTask:	
+    action: sendEmail	
+    scope: pull_request	
+    name: "send email for synapse PR"	
+    trigger:	
+      - path	
+    args:	
+      message: '<p>Dear Synapse Swagger reviewers,</p><p>Please check the PR ${URL} . You receive the email because the PR is making changes in the Synapse&#39;s path of the Azure REST Api Specs repository.</p><p>This PR need to be reviewed, please feel free to leave comments.</p><p>DO NOT REPLY: This email was automatically sent. Please send an email to&nbsp;<a href="mailto:[email protected]">[email protected]</a>&nbsp;if you have any questions.</p>'
+      targetPaths:	
+        - "specification/synapse/**"
+      subject: "[Action Required] Please review the PR ${URL}"	
+      to: [email protected]
+      cc:
+        - ${AUTHOR}

CODEOWNERS

@@ -11,7 +11,7 @@
 /specification/batch/ @paterasMSFT @dpwatrous
 /specification/batchai/ @alexanderyukhanov
 /specification/billing/ @wilcobmsft @asarkar84
-/specification/cdn/ @csmengwan @injyzarif @prakharsharma10
+/specification/cdn/ @jorinmejia @yunhemsft @jessicl-ms @sinadell @rrahulms @t-bzhan
 /specification/cognitiveservices/ @felixwa @yangyuan
 /specification/compute/ @bilaakpan-ms @sandido @dkulkarni-ms @haagha @madewithsmiles @MS-syh2qs @grizzlytheodore @hyonholee @mabhard @danielli90 @smotwani @ppatwa @vikramd-ms @savyasachisamal @yunusm @ZhidongPeng @nkuchta @maheshnemichand @najams @changov
 /specification/consumption/ @kjeur @panda-wang
@@ -20,7 +20,7 @@
 /specification/containerservice/ @yangl900
 /specification/cosmos-db/ @dmakwana @MehaKaushik @wmengmsft @shurd
 /specification/customer-insights/ @tjlvtao
-/specification/datafactory/ @shawnxzq
+/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,24 +59,24 @@
 /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
 /specification/streamanalytics/ @atpham256
 /specification/subscriptions/ @navysingla
-/specification/synapse/ @idear1203
+/specification/synapse/ @idear1203 @wonner
 /specification/timeseriesinsights/ @sandshadow
 /specification/trafficmanager/ @allencal @hrkulkarmsft
 /specification/web/ @naveedaz @Azure/azure-app-service-control-plane
@@ -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

@@ -76,6 +76,12 @@
                 "Tera"
             ]
         },
+        {
+            "filename": "**/specification/databox/resource-manager/Microsoft.DataBox/preview/2021-08-01-preview/databox.json",
+            "words": [
+                "Tera"
+            ]
+        },
         {
             "filename": "**/specification/servicebus/resource-manager/Microsoft.ServiceBus/stable/2017-04-01/Rules.json",
             "words": [
@@ -828,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"
             ]
@@ -839,6 +845,12 @@
                 "Orignal",
                 "Seleted"
             ]
+        },
+        {
+            "filename": "**/specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2021-10-15/iotdps.json",
+            "words": [
+                "Messsage"
+            ]
         }
     ]
 }