Merge from origin

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

@@ -3,7 +3,7 @@ schedules:
   displayName: Daily build
   branches:
     include:
-    - master
+    - main
   always: true
 
 pool:

.github/PULL_REQUEST_TEMPLATE.md

@@ -33,6 +33,7 @@ If any further question about AME onboarding or validation tools, please view th
 - [ ] Ensure to check this box if one of the following scenarios meet updates in the PR, so that label “WaitForARMFeedback” will be added automatically to involve ARM API Review. Failure to comply may result in delays for manifest application. Note this does not apply to data plane APIs, all “removals” and “adding a new property” no more require ARM API review.
   - Adding new API(s)
   - Adding a new API version
+  -  [ ] Ensure to copy the existing version into new directory structure for first commit (including refactoring) and then push new changes including version updates in separate commits. This is required to review the changes efficiently.
   - Adding a new service
 
 - [ ] Please ensure you've reviewed following [guidelines](https://aka.ms/rpguidelines) including [ARM resource provider contract](https://github.com/Azure/azure-resource-manager-rpc) and [REST guidelines](https://github.com/microsoft/api-guidelines/blob/vNext/azure/Guidelines.md). Estimated time (4 hours). This is required before you can request review from ARM API Review board.

.github/comment.yml

@@ -6,7 +6,7 @@
     booleanFilterExpression: "!(ARMSignedOff||ARMChangesRequested||Approved-OkToMerge||WaitForARMRevisit)"
     onCheckedLabels:
       - 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(armapireview@microsoft.com). cc @${PRAssignee} "
+    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(armapireview@microsoft.com)."
 
 - rule:
     type: label
@@ -50,6 +50,11 @@
       - "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. vsswagger@microsoft.com"
 
+- rule:
+    type: PROpen
+    onOpenedComments: "[Call for Action] To better understand Azure service dev/test scenario,  and support Azure service developer better on Swagger and REST API related tests in early phase, please help to fill in with this survey https://aka.ms/SurveyForEarlyPhase.  It will take 5 to 10 minutes.  If you already complete survey, please neglect this comment.  Thanks."
+
+
 - rule:
     type: checkbox
     keywords:

.github/pull_request_assignment.yml

@@ -7,6 +7,18 @@
       - kristapratico
       - maririos
 
+- rule:
+    paths:
+      - "specification/confidentialledger/data-plane/**"
+    reviewers:
+      - christothes 
+
+- rule:
+    paths:
+      - "specification/@(applicationinsights|operationalinsights)/**"
+    reviewers:
+      - akning-ms
+
 - rule:
     # eventgrid data-plane PR
     paths:
@@ -19,7 +31,14 @@
     paths:
       - "specification/synapse/data-plane/**"
     reviewers:
-      - jonathandturner
+      - lmazuel
+
+- rule:
+    # data-plane PR
+    paths:
+      - "specification/**/data-plane/iot**"
+    reviewers:
+      - drwill-ms
 
 - rule:
     # data-plane PR
@@ -29,23 +48,16 @@
       - anuchandy
       - jhendrixMSFT
       - tjprescott
-
 
 - rule:
     paths:
       - "specification/network/**"
     reviewers:
-      - kairu-ms
       - lirenhe
 
-- rule:
-    paths:
-      - "specification/@(applicationinsights|operationalinsights)/**"
-    reviewers:
-      - kairu-ms
 
 - rule:
-    paths: "specification/@(resources|powerplatform|appplatform)/**"
+    paths: "specification/@(resources|powerplatform|appplatform|deviceupdate)/**"
     reviewers:
       - raych1
 
@@ -57,7 +69,7 @@
 - rule:
     paths: "specification/sql/**"
     reviewers:
-      - akning-ms
+      - zhenglaizhang
 
 - rule:
     paths: "specification/signalr/**"
@@ -80,42 +92,36 @@
     reviewers:
       - ArcturusZhang
 
-- rule:
-    paths:
-      - "specification/azureactivedirectory/**"
-    reviewers:
-      - njuCZ
-
 - rule:
     paths:
       - "specification/authorization/**"
     reviewers:
-      - qianwens
+      - ruowan
 
 - rule:
     paths:
       - "specification/datafactory/**"
     reviewers:
-      - qianwens
+      - leni-msft
 
 - rule:
     paths:
       - "specification/monitor/**"
     reviewers:
       - weidongxu-microsoft
-      - kairu-ms
 
 - rule:
     paths:
       - "specification/storage/**"
     reviewers:
-      - Juliehzl
+      - jianyexi
 
 
 - rule:	
     paths: "specification/mediaservices/**"	
     reviewers:	
       - allenjzhang
+
 - rule:
     paths:
       - "specification/containerregistry/**"
@@ -157,14 +163,13 @@
     paths:
       - "specification/servicelinker/**"
     reviewers:
-      - PhoenixHe-msft
-
+      - raych1
+      
 - rule:
-    paths: 
-      - "specification/azurestack/**"
-      - "specification/automation/**"
+    paths:
+      - "specification/keyvault/**"
     reviewers:
-      - xiaoxuqi-ms
+      - zhenglaizhang
 
 - rule:
     paths:
@@ -192,18 +197,16 @@
     paths:
       - "**"
     reviewers:
-      - erich-wang
       - PhoenixHe-msft
       - lirenhe
       - weidongxu-microsoft
       - ArcturusZhang
       - raych1
-      - ChenTanyi
-      - njuCZ
       - akning-ms
       - leni-msft
-      - qianwens
       - ruowan
       - jianyexi
       - zhenglaizhang
       - chunyu3
+      - changlong-liu
+      - msyyc

CODEOWNERS

@@ -2,7 +2,8 @@
 /specification/analysisservices/ @taiwu
 /specification/alertsmanagement/ @ofirmanor @olalavi @erangon @orieldar @ilaizi @shakednai1 @khaboasb @orenhor
 /specification/apimanagement/ @promoisha @solankisamir
-/specification/applicationinsights/ @alexeldeib @ramthi @markwolff @trask @hectorhdzg @lzchen
+/specification/applicationinsights/ @alexeldeib
+/specification/applicationinsights/data-plane/Monitor.Exporters/ @ramthi @trask @hectorhdzg @lzchen
 /specification/asazure/ @athipp
 /specification/authorization/ @darshanhs90 @stankovski
 /specification/automation/ @vrdmr
@@ -62,23 +63,26 @@
 /specification/resources/ @Azure/arm-template-deployments @rajshah11 @vivsriaus
 /specification/scheduler/ @pinwang81
 /specification/search/data-plane/ @brjohnstmsft @arv100kri @bleroy @heaths @AlexGhiondea @Mohit-Chakraborty
-/specification/search/resource-manager/ @abhi1509 @miwelsh @tjacobhi
+/specification/search/resource-manager/ @abhi1509 @tjacobhi
 /specification/serialconsole/ @amitchat @craigw @asinn826
 /specification/service-map/ @daveirwin1
 /specification/servicebus/ @sazeesha @v-ajnava
 /specification/servicefabric/ @juhacket @samedder
-/specification/sql/ @jamestao @bcham
+/specification/sql/ @jamestao @bcham @apurvans
 /specification/storage/ @blueww @jasonyang-msft @xiaonlimsft
 /specification/storage/data-plane/ @kasobol-msft @seanmcc-msft
 /specification/storageimportexport/ @leoz-ms
 /specification/storagesync/ @ankushbindlish2
 /specification/storsimple8000series/ @manaas-microsoft
 /specification/streamanalytics/ @atpham256
 /specification/subscriptions/ @navysingla
+/specification/synapse/ @idear1203
 /specification/timeseriesinsights/ @sandshadow
 /specification/trafficmanager/ @allencal @hrkulkarmsft
 /specification/web/ @naveedaz @Azure/azure-app-service-control-plane
 /profile/ @shahabhijeet
-/specification/**/readme.typescript.md @qiaozha
-/specification/**/readme.go.md @ArcturusZhang
-/specification/**/readme.python.md @jsntcy @msyyc
+/specification/**/resource-manager/**/readme.typescript.md @qiaozha
+/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

README.md

@@ -5,7 +5,7 @@
 This repository is the canonical source for REST API specifications for Microsoft Azure.
 
 ## Getting started
-If you're a Microsoft employee looking for information about all of the repositories and steps in the pipeline, go to our [documentation](https://github.com/Azure/adx-documentation-pr/wiki) repository. Make sure to [join the Github Azure organization](http://aka.ms/azuregithub) to get access to that repo. 
+If you're a Microsoft employee looking for information about all of the repositories and steps in the pipeline, go to the [Azure SDK - Internal Wiki](https://aka.ms/jointhesdk). Make sure to [join the Github Azure organization](http://aka.ms/azuregithub) to get access to that wiki repo.  If any trouble with access, please submit a support request using this [form](https://aka.ms/swaggerfeedback).
 
 <b>Latest improvement:</b><i> Microsoft employees can try out our new experience at [OpenAPI Hub](https://aka.ms/openapihub) - online experience for using our validation tools and finding your workflow.</i>
 
@@ -82,7 +82,7 @@ The structure should appear like so:
 Currently, the specifications are expected to be in Swagger JSON format
 
 ## Next steps
-The next step in the process after a spec is completed is to generate SDKs and API reference documentation. If you're Microsoft employee, go to the [Azure Developer Experience guide](https://github.com/Azure/adx-documentation-pr) for more information.
+The next step in the process after a spec is completed is to generate SDKs and API reference documentation. If you're Microsoft employee, go to the [Azure SDK - Internal Wiki](https://aka.ms/jointhesdk) for more information.
 
 ---
 _This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments._

arm-compute/quickstart-templates/aliases.json

@@ -15,18 +15,18 @@
             "sku": "7.5",
             "version": "latest"
           },
-          "CoreOS": {
-            "publisher": "CoreOS",
-            "offer": "CoreOS",
-            "sku": "Stable",
-            "version": "latest"
-          },
           "Debian": {
             "publisher": "Debian",
             "offer": "debian-10",
             "sku": "10",
             "version": "latest"
           },
+          "Flatcar": {
+            "publisher": "kinvolk",
+            "offer": "flatcar-container-linux-free",
+            "sku": "stable",
+            "version": "latest"
+          },
           "openSUSE-Leap": {
             "publisher": "SUSE",
             "offer": "openSUSE-Leap",

azure-pipelines.yml

@@ -19,7 +19,6 @@ variables:
 
 jobs:
 - template: .azure-pipelines/BranchProtectionForPrivateRepo.yml
-- template: .azure-pipelines/Syntax.yml
 - template: .azure-pipelines/NetworkValidation.yml
 - template: .azure-pipelines/Spellcheck.yml
 - template: .azure-pipelines/PrettierCheck.yml