Azure · lmazuel · May 21, 2022 · Apr 6, 2022 · Apr 6, 2022 · Apr 6, 2022
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -11,7 +11,7 @@ Add a changelog entry for this PR by answering the following questions:
       - [ ] Other, please clarify
   2. When are you targeting to deploy the new service/feature to public regions? Please provide the date or, if the date is not yet available, the month.
   3. When do you expect to publish the swagger? Please provide date or, the the date is not yet available, the month.
-  4. If updating an existing version, please select the specific langauge SDKs and CLIs that must be refreshed after the swagger is published.
+  4. If updating an existing version, please select the specific language SDKs and CLIs that must be refreshed after the swagger is published.
       - [ ] SDK of .NET (need service team to ensure code readiness)
       - [ ] SDK of Python
       - [ ] SDK of Java
@@ -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 appy to the PR so that the label "ARMReview" and "WaitForARMFeedback" will be added by bot to kick off ARM API Review.  Missing to check this box in the following scenario may result in delays to the ARM manifest review and deployment.
   - Adding a new service
   - Adding new API(s)
   - Adding a new API version

diff --git a/.github/PULL_REQUEST_TEMPLATE/control_plane_template.md b/.github/PULL_REQUEST_TEMPLATE/control_plane_template.md
@@ -0,0 +1,53 @@
+## ARM API Information (Control Plane)
+
+<i>MSFT employees can try out our new experience at <b>[OpenAPI Hub](https://aka.ms/openapiportal) </b> - one location for using our validation tools and finding your workflow.
+</i>
+Azure 1st Party Service can try out the [Shift Left](https://aka.ms/ShiftLeft) experience to initiate API design review from ADO code repo.  If you are interested, may request engineering support by filling in with the form https://aka.ms/ShiftLeftSupportForm.
+
+### Changelog
+Add a changelog entry for this PR by answering the following questions:
+  1. What's the purpose of the update?
+      - [ ] new service onboarding
+      - [ ] new API version
+      - [ ] update existing version for new feature
+      - [ ] update existing version to fix swagger quality issue in s360
+      - [ ] Other, please clarify
+  2. When are you targeting to deploy the new service/feature to public regions? Please provide the date or, if the date is not yet available, the month.
+  3. When do you expect to publish the swagger? Please provide date or, the the date is not yet available, the month.
+  4. By default, Azure SDKs of all languages (.NET/Python/Java/JavaScript for both management-plane SDK and data-plane SDK, Go for management-plane SDK only ) MUST be refreshed with/after swagger of new version is published. If you prefer NOT to refresh any specific SDK language upon swagger updates in the current PR, please leave details with justification here.
+
+### Contribution checklist (MS Employees Only):
+- [ ] I commit to follow the [Breaking Change Policy](https://aka.ms/AzBreakingChangesPolicy) of "no breaking changes"
+- [ ] I have reviewed the [documentation](https://aka.ms/ameonboard) for the workflow.
+- [ ] [Validation tools](https://aka.ms/swaggertools) were run on swagger spec(s) and errors have all been fixed in this PR. [How to fix?](https://aka.ms/ci-fix)
+
+If any further question about AME onboarding or validation tools, please view the [FAQ](https://aka.ms/faqinprreview).
+
+### ARM API Review Checklist
+
+> **Applicability**: :warning:
+>
+> If your changes encompass only the following scenarios, you should SKIP this section, as these scenarios do not require ARM review.
+> - Change to data plane APIs
+> - Adding new properties
+> - 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.
+  - Adding a new service
+  - Adding new API(s)
+  - Adding a new API version
+    -[ ] To review changes efficiently, ensure you copy the existing version into the new directory structure for first commit and then push new changes, including version updates, in separate commits. You can use OpenAPIHub to initialize the PR for adding a new version. For more details refer to the [wiki](https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/208/OpenAPI-Hub-Adding-new-API-version).
+
+- [ ] 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.
+
+- [ ] If you are blocked on ARM review and want to get the PR merged with urgency, please get the ARM oncall for reviews (*RP Manifest Approvers* team under <ins>Azure Resource Manager service</ins>) from IcM and reach out to them.
+
+### Breaking Change Review Checklist
+If you have any breaking changes as defined in the [Breaking Change Policy](https://aka.ms/AzBreakingChangesPolicy/), request approval from the Breaking Change Review Board.
+
+**Action**: to initiate an evaluation of the breaking change, create a new intake using the [template for breaking changes](https://aka.ms/Breakingchangetemplate). Additional details on the process and office hours are on the [Breaking Change Wiki](https://dev.azure.com/msazure/AzureWiki/_wiki/wikis/AzureWiki.wiki/37684/Breaking-Changes).
+
+NOTE: To update API(s) in public preview for over 1 year (refer to [Retirement of Previews](https://dev.azure.com/msazure/AzureWiki/_wiki/wikis/AzureWiki.wiki/37683/Retirement-of-Previews))
+
+Please follow the link to find more details on [PR review process](https://aka.ms/SwaggerPRReview).
diff --git a/.github/PULL_REQUEST_TEMPLATE/data_plane_template.md b/.github/PULL_REQUEST_TEMPLATE/data_plane_template.md
@@ -0,0 +1,48 @@
+# Data Plane API - Pull Request
+<!-- 🚨🚨🚨 Replace this line with a summary and reason for these changes to your data plane API 🚨🚨🚨 -->
+
+## API Info: The Basics
+Most of the information about your service should be captured in the issue that serves as your [*engagement record*](https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/271/Azure-REST-API-Stewardship?anchor=rest-api-stewardship-process).
+
+* Link to engagement record issue:
+
+Is this review for (select one):
+
+- [ ] a private preview
+- [ ] a public preview
+- [ ] GA release
+
+### Change Scope
+<sup>This section will help us focus on the specific parts of your API that are new or have been modified. <br/>Please share a link to the design document for the new APIs, a link to the previous Open API document (swagger) if applicable, and the root paths that have been updated. </sup>
+* Design Document:
+* Previous Open API Doc:
+* Updated paths:
+
+## ❔Got questions? Need additional info?? We are here to help!
+
+<details>
+  <summary> Contact us!</summary>
+
+The [Azure API Review Board](https://aka.ms/azapi) is dedicated to helping you create amazing APIs. You can read about our mission and learn more about our process on our [wiki](https://aka.ms/azapi).
+* 💬 [Teams Channel](https://teams.microsoft.com/l/channel/19%3a3ebb18fded0e47938f998e196a52952f%40thread.tacv2/General?groupId=1a10b50c-e870-4fe0-8483-bf5542a8d2d8&tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47)
+* 💌 [email](mailto://[email protected])
+
+</details>
+
+<details>
+  <summary>Click here for links to tools, specs, guidelines & other good stuff</summary>
+
+### Tooling
+ * [Open API validation tools](https://aka.ms/swaggertools) were run on this PR. Go here to see [how to fix errors](https://aka.ms/ci-fix)
+ * [Spectral Linting](https://aka.ms/style)
+ * [Open API Hub](https://aka.ms/openapiportal)
+
+### Guidelines & Specifications
+ * [Azure REST API Guidelines](https://aka.ms/guidelines)
+ * [OpenAPI Style Guidelines](https://aka.ms/style)
+ * [Azure Breaking Change Policy](https://aka.ms/AzBreakingChangesPolicy)
+
+### Helpful Links
+ * [Azure DevTools Wiki](https://aka.ms/azapi)
+
+</details>
diff --git a/.github/comment.yml b/.github/comment.yml
@@ -6,14 +6,15 @@
     booleanFilterExpression: "!(ARMSignedOff||ARMChangesRequested||Approved-OkToMerge||WaitForARMRevisit)"
     onCheckedLabels:
       - WaitForARMFeedback
+      - ARMReview
     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])."
 
 - rule:
     type: label
     label: BreakingChangeReviewRequired
     variables:
         openapiHub: https://portal.azure-devex-tools.com
-    onLabeledComments: "Hi @${PRAuthor}, one or multiple breaking change(s) is detected in your PR. Please check out the breaking change(s), and provide business justification in the PR comment and @ PR assignee why you must have these change(s), and how external customer impact can be mitigated. Please ensure to follow [breaking change policy](https://aka.ms/AzBreakingChangesPolicy) to request breaking change review and approval before proceeding swagger PR review. </br>**Action**: To initiate an evaluation of the breaking change, create a new intake using the [template for breaking changes](https://aka.ms/Breakingchangetemplate). Addition details on the process and office hours are on the [Breaking change Wiki](https://dev.azure.com/msazure/AzureWiki/_wiki/wikis/AzureWiki.wiki/37684/Breaking-Changes).</br> If you want to know the production traffic statistic, please see [ARM Traffic statistic](${openapiHub}/api/pr/query-traffic?pr=${owner}/${repo}/${PRNumber}&days=5). </br> If you think it is false positive breaking change, please provide the reasons in the PR comment, report to Swagger Tooling Team via https://aka.ms/swaggerfeedback."
+    onLabeledComments: "Hi @${PRAuthor}, one or multiple breaking change(s) is detected in your PR. Please check out the breaking change(s), and provide business justification in the PR comment and @ PR assignee why you must have these change(s), and how external customer impact can be mitigated. Please ensure to follow [breaking change policy](https://aka.ms/AzBreakingChangesPolicy) to request breaking change review and approval before proceeding swagger PR review. </br>**Action**: To initiate an evaluation of the breaking change, create a new intake using the [template for breaking changes](https://aka.ms/Breakingchangetemplate). Addition details on the process and office hours are on the [Breaking change Wiki](https://dev.azure.com/msazure/AzureWiki/_wiki/wikis/AzureWiki.wiki/37684/Breaking-Changes).</br> If you want to know the production traffic statistic, please see [ARM Traffic statistic](${openapiHub}/api/pr/query-traffic?pr=${owner}/${repo}/${PRNumber}&days=5). </br> If you think it is false positive breaking change, please provide the reasons in the PR comment, report to Swagger Tooling Team via https://aka.ms/swaggerfeedback. </br> **Note**: To avoid breaking change, you can refer to [Shift Left Solution](https://aka.ms/shiftleft) for detecting breaking change in early phase at your service code repository."
 
 - rule:
     type: label
@@ -48,17 +49,38 @@
       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/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
-    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."
-
+    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: checkbox
     keywords:
       - "update existing version to fix swagger quality issue in s360"
     onCheckedLabels:
       - FixS360
+
+- rule:
+    type: label
+    label: WaitForARMFeedback
+    onLabeledRemoveLabels:
+        - ARMChangesRequested
+
+- rule:
+    type: label
+    label: ARMSignedOff
+    onLabeledRemoveLabels:
+        - WaitForARMFeedback
+        - ARMChangesRequested
+
+- rule:
+    type: label
+    label: ARMChangesRequested
+    onLabeledRemoveLabels:
+        - WaitForARMFeedback
+
+- rule:
+    type: unlabeled
+    label: ARMChangesRequested
+    onUnlabeledAddLabels:
+        - WaitForARMFeedback
+        - ARMReview
 
diff --git a/.github/pull_request_assignment.yml b/.github/pull_request_assignment.yml
@@ -25,6 +25,13 @@
       - "specification/eventgrid/data-plane/**"
     reviewers:
       - lmazuel
+
+- rule:
+    # storage data-plane PR
+    paths:
+      - "specification/storage/data-plane/**"
+    reviewers:
+      - tg-msft
 
 - rule:
     # synapse data-plane PR
@@ -65,24 +72,25 @@
       - leni-msft
       - ruowan
       - jianyexi
-      - zhenglaizhang
-      
+      - xiaoxuqi-ms
+
 
 - rule:
-    paths: "specification/@(resources|powerplatform|appplatform|deviceupdate|servicelinker)/**"
+    paths: "specification/@(providerhub|sql|appplatform|deviceupdate|servicelinker)/**"
     reviewers:
       - raych1
+      - xiaoxuqi-ms
 
 - rule:
     paths: "specification/@(security|edgeorder|synapse)/**"
     reviewers:
       - ruowan
 
 - rule:
-    paths: "specification/sql/**"
+    paths: "specification/powerplatform/**"
     reviewers:
-      - zhenglaizhang
-
+      - honghr
+            
 - rule:
     paths: "specification/signalr/**"
     reviewers:
@@ -111,7 +119,7 @@
 
 - rule:
     paths:
-      - "specification/datafactory/**"
+      - "specification/@(resources|datafactory)/**"
     reviewers:
       - leni-msft
 
@@ -147,10 +155,11 @@
       - weidongxu-microsoft
 
 - rule:
-    paths:
-      - "specification/keyvault/**"
+    paths: 
+      - "specification/securityinsights/**"
     reviewers:
-      - zhenglaizhang
+      - dw511214992
+
 
 - rule:
     paths:
@@ -178,7 +187,6 @@
     reviewers:
       - akning-ms
       - raych1
-      - zhenglaizhang
 
 - rule:
     # manager-plane PR
@@ -193,9 +201,12 @@
       - leni-msft
       - ruowan
       - jianyexi
-      - zhenglaizhang
       - chunyu3
       - changlong-liu
       - msyyc
       - qiaozha
       - dw511214992
+      - honghr
+      - tianxchen-ms
+      - tadelesh
+      - xiaoxuqi-ms
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,9 +1,10 @@
+/dev/cognitiveservices/data-plane/Language/ @assafi @rokulka @ChongTang @annatisch @heaths @Azure/api-stewardship-board
 /specification/adp/ @Azure/adp
 /specification/analysisservices/ @taiwu
 /specification/alertsmanagement/ @ofirmanor @olalavi @erangon @orieldar @ilaizi @shakednai1 @khaboasb @orenhor
 /specification/apimanagement/ @promoisha @solankisamir
 /specification/applicationinsights/ @alexeldeib
-/specification/applicationinsights/data-plane/Monitor.Exporters/ @ramthi @trask @hectorhdzg @lzchen
+/specification/applicationinsights/data-plane/Monitor.Exporters/ @ramthi @trask @hectorhdzg @lzchen @Azure/api-stewardship-board
 /specification/asazure/ @athipp
 /specification/authorization/ @darshanhs90 @stankovski
 /specification/automation/ @vrdmr
@@ -13,11 +14,12 @@
 /specification/billing/ @wilcobmsft @asarkar84
 /specification/cdn/ @jorinmejia @yunhemsft @jessicl-ms @sinadell @rrahulms @t-bzhan
 /specification/cognitiveservices/ @felixwa @yangyuan
+/specification/cognitiveservices/data-plane/Language/ @assafi @rokulka @ChongTang @annatisch @heaths @Azure/api-stewardship-board
 /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
 /specification/containerinstance/ @novinc
 /specification/containerregistry/ @djyou
-/specification/containerservice/ @yangl900
+/specification/containerservice/ @palma21 @weinong @seguler @alvinli222 @justindavies @matthchr @robbiezhang @paulgmiller @yizhang4321 @circy9 @qike-ms
 /specification/cosmos-db/ @dmakwana @MehaKaushik @wmengmsft @shurd
 /specification/customer-insights/ @tjlvtao
 /specification/datafactory/ @Frey-Wang @zhangyd2015 @davidzhaoyue
@@ -62,15 +64,15 @@
 /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/data-plane/ @brjohnstmsft @arv100kri @bleroy @AlexGhiondea @Mohit-Chakraborty @Azure/api-stewardship-board
 /specification/search/resource-manager/ @abhi1509 @tjacobhi
 /specification/serialconsole/ @amitchat @craigw @asinn826
 /specification/service-map/ @daveirwin1
 /specification/servicebus/ @v-ajnava @dsouzaarun @damodaravadhani
 /specification/servicefabric/ @juhacket @samedder
 /specification/sql/ @jamestao @ericshape @apurvans
 /specification/storage/ @jasonyang-msft @xiaonlimsft
-/specification/storage/data-plane/ @seanmcc-msft
+/specification/storage/data-plane/ @seanmcc-msft @Azure/api-stewardship-board
 /specification/storageimportexport/ @leoz-ms
 /specification/storagesync/ @ankushbindlish2
 /specification/storsimple8000series/ @manaas-microsoft
@@ -86,3 +88,4 @@
 /specification/**/resource-manager/**/readme.cli.md @jsntcy @qiaozha
 /specification/**/resource-manager/**/readme.go.md @ArcturusZhang
 /specification/**/resource-manager/**/readme.python.md @msyyc @BigCat20196
+/specification/*/data-plane/ @Azure/api-stewardship-board