Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs …

…into josuh_optional

.azure-pipelines-preproduction/package.json

@@ -10,8 +10,8 @@
   "description": "Tests for Azure REST API Specifications",
   "license": "MIT",
   "devDependencies": {
-    "@azure/avocado": "^0.6.3",
-    "@azure/rest-api-specs-scripts": "^0.7.2",
+    "@azure/avocado": "^0.6.4",
+    "@azure/rest-api-specs-scripts": "^0.10.2",
     "@ts-common/commonmark-to-markdown": "^1.2.0",
     "@ts-common/fs": "0.2.0",
     "@ts-common/iterator": "^0.3.6",

.azure-pipelines/NetworkValidation.yml

@@ -18,7 +18,7 @@ jobs:
     displayName: Install Node.js
   - script: npm install autorest -g
     displayName: Install autorest
-  - script: git clone --depth 1 -- https://dev.azure.com/v-anevse/BuildScripts/_git/BuildScripts ..\BuildScripts
+  - script: git clone --depth 1 -- https://dev.azure.com/nrp-swagger/swagger-stack/_git/automation-scripts ..\BuildScripts
     displayName: Clone build tools
   - powershell: |
       $swgrPath = (Get-Item ".\").FullName

.azure-pipelines/SDKAutomation.yml

@@ -23,6 +23,7 @@ jobs:
       BLOB_STORAGE_PREFIX: sdkautomation-pipeline
       SPEC_REPO: $(Build.Repository.Name)
       PR_NUMBER: $(System.PullRequest.PullRequestNumber)
+      BUILD_ID: $(Build.BuildId)
   strategy:
     matrix:
       Net:
@@ -33,6 +34,8 @@ jobs:
         SDK_REPO_NAME: azure-sdk-for-js
       Python:
         SDK_REPO_NAME: azure-sdk-for-python
+      PythonT2:
+        SDK_REPO_NAME: azure-sdk-for-python-track2
       Cliextension:
         SDK_REPO_NAME: azure-cli-extensions
       Go:
@@ -69,11 +72,14 @@ jobs:
         -e SPEC_REPO \
         -e PR_NUMBER \
         -e SDK_REPO_NAME \
+        -e AZURE_DEVOPS_EXT_PAT \
+        -e BUILD_ID \
         sdk-automation:latest npm start
     env:
       BLOB_STORAGE_NAME: $(blob-storage-name)
       BLOB_STORAGE_KEY: $(blob-storage-key)
       GITHUB_COMMENT_AUTHOR_NAME: $(github-comment-author-name)
       GITHUBAPP_ID: $(githubapp-id)
       GITHUBAPP_PRIVATE_KEY: $(githubapp-private-key)
+      AZURE_DEVOPS_EXT_PAT: $(azure-devops-ext-pat)
     displayName: SDK Automation

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +1,20 @@
-### Latest improvements:
 <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><br>
+</i>
+
 ### Contribution checklist:
-- [ ] I have reviewed the [documentation](https://github.com/Azure/adx-documentation-pr/wiki/Overall-basic-flow) for the workflow.
-- [ ] [Validation tools](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/swagger-checklist.md#validation-tools-for-swagger-checklist) were run on swagger spec(s) and have all been fixed in this PR.
-- [ ] The [OpenAPI Hub](https://aka.ms/openapiportal) was used for checking validation status and next steps.
+- [ ] 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 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
-- [ ] Service team MUST add the "WaitForARMFeedback" label if the management plane API changes fall into one of the below categories. 
-- adding/removing APIs.
-- adding/removing properties.
-- adding/removing API-version. 
-- adding a new service in Azure.
+- [ ] Service team MUST add the "**WaitForARMFeedback**" label if the management plane API changes fall into one of the below categories. 
+  - adding/removing APIs.
+  - adding/removing properties.
+  - adding/removing API-version. 
+  - adding a new service in Azure.
+
+<i>Failure to comply may result in delays for manifest application. Note this does not apply to data plane APIs.</i>
 
-Failure to comply may result in delays for manifest application. Note this does not apply to data plane APIs.
 - [ ] If you are blocked on ARM review and want to get the PR merged urgently, please get the ARM oncall for reviews (RP Manifest Approvers team under Azure Resource Manager service) from IcM and reach out to them. 
-Please follow the link to find more details on [API review process](https://armwiki.azurewebsites.net/rp_onboarding/ResourceProviderOnboardingAPIRevieworkflow.html).
+Please follow the link to find more details on [API review process](https://aka.ms/SwaggerPRReview).

.github/assignment.yml

@@ -30,7 +30,7 @@
       - yungezz
 
 - rule:
-    path: "specification/resources/**"
+    paths: "specification/resources/**"
     reviewers:
       - raych1
 
@@ -151,5 +151,4 @@
       - markcowl
       - leni-msft
       - qianwens
-      - allenjzhang
       - ruowan

.github/issue_assignment.yml

@@ -0,0 +1,22 @@
+---
+- rule:
+    booleanFilterExpression: "needs-triage"
+    assignees:
+      - yungezz
+      - zikalino
+      - erich-wang
+      - NullMDR
+      - raych1
+      - lirenhe
+      - weidongxu-microsoft
+      - ArcturusZhang
+      - xccc-msft
+      - ChenTanyi
+      - fengzhou-msft
+      - njuCZ
+      - akning-ms
+      - markcowl
+      - leni-msft
+      - qianwens
+      - ruowan
+      - MyronFanQiu

.github/pull_request_assignment.yml

@@ -0,0 +1,154 @@
+---
+- rule:
+    # data-plane PR
+    paths:
+      - "specification/**/data-plane/**"
+    reviewers:
+      - anuchandy
+      - jhendrixMSFT
+      - lmazuel
+      - tjprescott
+
+- rule:
+    paths:
+      - "specification/network/**"
+    reviewers:
+      - lirenhe
+      - MyronFanQiu
+
+- rule:
+    paths:
+      - "specification/@(applicationinsights|operationalinsights)/**"
+    reviewers:
+      - MyronFanQiu
+
+- rule:
+    paths: "specification/compute/**"
+    reviewers:
+      - ArcturusZhang
+      - fengzhou-msft
+      - yungezz
+
+- rule:
+    paths: "specification/resources/**"
+    reviewers:
+      - raych1
+
+- rule:
+    paths:
+      - "specification/machinelearningservices/**"
+    reviewers:
+      - ArcturusZhang
+
+- rule:
+    paths:
+      - "specification/@(azureactivedirectory|appplatform)/**"
+    reviewers:
+      - njuCZ
+
+- rule:
+    paths:
+      - "specification/authorization/**"
+    reviewers:
+      - qianwens
+      - yungezz
+
+- rule:
+    paths:
+      - "specification/datafactory/**"
+    reviewers:
+      - qianwens
+
+- rule:
+    paths:
+      - "specification/monitor/**"
+    reviewers:
+      - weidongxu-microsoft
+      - MyronFanQiu
+
+- rule:
+    paths:
+      - "specification/storage/**"
+    reviewers:
+      - qianwens
+      - Juliehzl
+
+- rule:
+    paths: "specification/mediaservices/**"
+    reviewers:
+      - allenjzhang
+
+- rule:
+    paths:
+      - "specification/@(keyvault|notificationhubs)/**"
+      - "specification/@(databricks|containerregistry)/**"
+    reviewers:
+      - fengzhou-msft
+
+- rule:
+    paths:
+      - "specification/@(containerservice|containerinstance)/**"
+    reviewers:
+      - NullMDR
+      - fengzhou-msft
+      - yungezz
+
+- rule:
+    paths:
+      - "specification/mixedreality/**"
+    reviewers:
+      - leni-msft
+
+- rule:
+    paths:
+      - "specification/portal/**"
+    reviewers:
+      - NullMDR
+
+- rule:
+    paths:
+      - "specification/web/**"
+    reviewers:
+      - weidongxu-microsoft
+
+- rule:
+    paths:
+      - "documentation/**"
+    reviewers:
+      - josefree
+      - akning-ms
+
+- rule:
+    paths:
+      - "**/package.json"
+      - ".github/**"
+      - "**/azure-pipelines.yml"
+      - ".azure-pipelines/**"
+      - ".azure-pipelines-preproduction/**"
+    reviewers:
+      - akning-ms
+      - NullMDR
+      - raych1
+
+- rule:
+    # manager-plane PR
+    paths:
+      - "**"
+    reviewers:
+      - yungezz
+      - zikalino
+      - erich-wang
+      - NullMDR
+      - raych1
+      - lirenhe
+      - weidongxu-microsoft
+      - ArcturusZhang
+      - xccc-msft
+      - ChenTanyi
+      - fengzhou-msft
+      - njuCZ
+      - akning-ms
+      - markcowl
+      - leni-msft
+      - qianwens
+      - ruowan

.github/sla.yml

@@ -1,48 +1,86 @@
 ---
 - scheduleTask:
-    action: sendEmailToAssignee
-    repoWhitelist:
-      - Azure/azure-rest-api-specs
+    action: sendEmail
     scope: pull_request
+    name: "send email to swagger reviewer"
+    trigger:
+      - label
     args:
-      booleanFilterExpression: "!(WaitForARMFeedback||(DoNotMerge&&(ARMSignedOff||Approved)))"
-      limit: 48h
-      message: '<p> Dear Swagger reviewer, <br> <br> Please response to the PR ${URL} . The PR isn''t updated in 48 hours. <br> <hr /> <br> Quick info. <ul> <li>If no response from ARM review board, please send email to armapireview@microsoft.com.</li> <li>If need immediate ARM review, please get ARM review oncall contact point from ICM https://icm.ad.msft.net/imp/v3/oncall/current under Service "Azure Resource Manager" and Team "RP Manifest Approvers"</li> <li>If no response from Azure API review board, please send email to azureapirbcore@microsoft.com.</li> <li>If you have problem to fix CI task errors, please send email to Visual Studio China Swagger and Tool team vscswagger@microsoft.com.</li> <li>If you want to opt out from Swagger reviewing for out of office period, please set vacation date at https://inframonitorweb1.azurewebsites.net/Home/MyView.</li> <li>Pls refer to <a href="onenote:https://microsoft.sharepoint.com/teams/IoTToolingTeam/SiteAssets/IoT Tooling Team Notebook/Azure Management Experience - transition.one#Swagger%20reviewing%20process§ion-id={ECE847C4-519B-4448-A1A0-8E84A7EFE8AB}&page-id={F6E345FE-46E1-420F-B837-6BF76167DE05}&end">Swagger review process (onenote)</a> for more about Swagger review process.</li> </ul> Best regards, <br> Azure Management Experience </p>'
-      subject: "Action Required: Please respond to PR ${URL}"
-    description: "None initial response in 48 hours. For public repo."
-    name: "[PUBLIC] initial response notification"
+      booleanFilterExpression: "WaitForReviewRevisit&&!NotReadyForReview"
+      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:armapireview@microsoft.com">armapireview@microsoft.com</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:azureapirbcore@microsoft.com">azureapirbcore@microsoft.com</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 (vscswagger@microsoft.com).</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: sendEmailToAssignee
-    repoWhitelist:
-      - Azure/azure-rest-api-specs-pr
+    action: sendEmail
     scope: pull_request
+    name: "send email to swagger reviewer"
+    trigger:
+      - time
     args:
-      booleanFilterExpression: "!(WaitForARMFeedback||Approved-OkToMerge||(DoNotMerge&&(ARMSignedOff||Approved)))"
+      booleanFilterExpression: "!(NotReadyForReview||Reviewed-ChangesRequired||WaitForARMFeedback||WaitForARMRevisit||Approved-OkToMerge||(DoNotMerge&&(ARMSignedOff||Approved)))"
       limit: 48h
-      message: '<p> Dear Swagger reviewer, <br> <br> Please response to the PR ${URL} . The PR isn''t updated in 48 hours. <br> <hr /> <br> Quick info. <ul> <li>If no response from ARM review board, please send email to armapireview@microsoft.com.</li> <li>If need immediate ARM review, please get ARM review oncall contact point from ICM https://icm.ad.msft.net/imp/v3/oncall/current under Service "Azure Resource Manager" and Team "RP Manifest Approvers"</li> <li>If no response from Azure API review board, please send email to azureapirbcore@microsoft.com.</li> <li>If you have problem to fix CI task errors, please send email to Visual Studio China Swagger and Tool team vscswagger@microsoft.com.</li> <li>If you want to opt out from Swagger reviewing for out of office period, please set vacation date at https://inframonitorweb1.azurewebsites.net/Home/MyView.</li> <li>Pls refer to <a href="onenote:https://microsoft.sharepoint.com/teams/IoTToolingTeam/SiteAssets/IoT Tooling Team Notebook/Azure Management Experience - transition.one#Swagger%20reviewing%20process§ion-id={ECE847C4-519B-4448-A1A0-8E84A7EFE8AB}&page-id={F6E345FE-46E1-420F-B837-6BF76167DE05}&end">Swagger review process (onenote)</a> for more about Swagger review process.</li> </ul> Best regards, <br> Azure Management Experience </p>'
-      subject: "Action Required: Please respond to PR ${URL}"
-    description: "None initial response in 48 hours. For private repo."
-    name: "[PRIVATE] initial response notification"
+      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:armapireview@microsoft.com">armapireview@microsoft.com</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:azureapirbcore@microsoft.com">azureapirbcore@microsoft.com</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 (vscswagger@microsoft.com).</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
+    name: "send email to ARM review board"
+    trigger:
+      - label
     args:
-      booleanFilterExpression: "(WaitForARMFeedback&&!ARMSignedOff&&!ARMChangesRequested&&!ARMReviewInProgress)"
-      limit: 3d
-      subject: "Action Required: Please help to review PR ${URL}"
-      message: "<p> Dear ARM review board, <br> <br>Please review PR ${URL} , the PR is waiting for ARM review over 3 days. Thanks.<br><hr /> <br>Quick info<ul><li>If you have feedback about the notification email, please contact us at vscswagger@microsoft.com.</li><li>After reviewing, please remove “WaitForARMFeedback” label from PR to avoid receiving notification on the same PR.</li><li>Please do not reply to this email, this is an automatic generated email.</li></ul>Best regards,<br> Azure Management Experience</p>"
+      booleanFilterExpression: "(WaitForARMFeedback||WaitForARMRevisit)&&!NotReadyForReview&&!ARMSignedOff&&!ARMChangesRequested"
+      message: '<p>Dear ARM review board,</p><p>Please review the PR ${URL} . You receive the email because the PR is labeled with either "WaitForARMFeedback" or "WaitForARMRevisit".</p><p>Quick info.</p><ul><li>After review, please remove the label &ldquo;WaitForARMFeedback&rdquo; or "WaitForARMRevisit" from the PR, so that there will not be further notification email.</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 (vscswagger@microsoft.com).</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: armapireview@microsoft.com
-    description: "send email to ARM team for over 5 days PRs labelled with WaitForARMFeedback"
-    name: "send email to ARM team"
+      cc:
+        - ${AUTHOR}
+        - ${ASSIGNEE}
+
+- scheduleTask:
+    action: sendEmail
+    scope: pull_request
+    name: "send email to swagger and tools team"
+    trigger:
+      - label
+    args:
+      booleanFilterExpression: (LintRuleCandidate||ValidationToolBug)
+      message: '<p>Dear Swagger and Tools Team,</p><p>Please check the PR ${URL} . You receive the email because the PR is labeled "LintRuleCandidate" or "ValidationToolBug"</p><p>Quick info.</p><ul><li>After review, please ensure to replace the label &ldquo;LintRuleCandidate&rdquo; or "ValidationToolBug" with "LintRuleCandidateCollected" or "ValidationToolBugCollected", so that there will not be further notification email.</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 (vscswagger@microsoft.com).</em></p><p>Best regards,</p><p>Swagger and Tools Team, Azure Management Experience</p>'
+      subject: "Action Required: Please review the PR ${URL}"
+      to: vscswagger@microsoft.com
+      cc:
+        - ${AUTHOR}
+        - ${ASSIGNEE}
 
 - scheduleTask:
-    action: sendEmailToAssignee
+    action: sendEmail
+    scope: pull_request
+    name: "send email to PR author"
+    trigger:
+      - label
+      - time
+    args:
+      limit: 72h
+      booleanFilterExpression: (Reviewed-ChangesRequired||ARMChangeRequest)
+      message: '<p>Dear PR author,</p><p>The PR Reviewer has commented on your PR ${URL} , putting on the label "Reviewed-ChangesRequired" or "ARMChangeRequest". Please check out the comment by clicking the PR link attached previously, and update your commits accordingly.</p><p>Please ensure to remove "Reviewed-ChangesRequired" or "ARMChangeRequest" label, after you complete updates and comment back. If you need ARM board or swagger reviewer revisit your PR, please label the PR with "WaitForARMRevisit" and "WaitForReviewRevisit" respectively.</p><p>Quick info.</p><ul><li>How to fix CI error:&nbsp;<a href="https://aka.ms/ci-fix">https://aka.ms/ci-fix</a></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 (vscswagger@microsoft.com).</em></p><p>Best regards,</p><p>Swagger and Tools Team, Azure Management Experience</p>'
+      subject: "Action Required: Please update your PR ${URL}"
+      to: ${AUTHOR}
+      cc:
+        - ${ASSIGNEE}
+
+- scheduleTask:
+    action: sendEmail
     scope: issue
     args:
-      booleanFilterExpression: "triage"
+      booleanFilterExpression: "needs-triage"
       limit: 48h
       message: "<p> Dear Swagger reviewer, <br> <br> Please response to the issue ${URL} . The issue isn't updated in 48 hours. <br> <hr /> <br> Quick info. <ul>  <li>If you have any question, please send email to Visual Studio Swagger and Tool team vscswagger@microsoft.com.</li>  </ul> Best regards, <br> Azure Management Experience </p>"
       subject: "Action Required: Please respond to issue ${URL}"
-      cc: Ankun.Ning@microsoft.com
+      to: ${ASSIGNEE}
+      cc: vscswagger@microsoft.com