Merge from upstream.

.gitattributes

@@ -1,2 +1,2 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
+# Use unix line endings always, even on Windows
+* text=auto eol=lf

.github/PULL_REQUEST_TEMPLATE/control_plane_template.md

@@ -6,13 +6,13 @@ Please understand this diagram before proceeding. It explains how to get your PR
 
 ![diagram](https://github.com/Azure/azure-rest-api-specs/assets/4429827/b321e1dc-5e07-4940-9cd6-a65ac6729a8b)
 
-[1] [public repo review queue], [private repo review queue]  
+[1] [ARM review queue] (for **merge** queues, see [4])  
 The PRs are processed by time opened, ascending. Your PR may show up on 2nd or later page. 
 If you addressed Step 1 from the diagram and your PR is not showing up in the queue, ensure the label `ARMChangesRequested` 
 is removed from your PR. This should cause the label `WaitForARMFeedback` to be added.  
 [2] https://aka.ms/azsdk/support/specreview-channel  
 [3] [List of SDK breaking changes approvers] in pinned Teams announcement  
-[4] [public repo merge queue], [private repo merge queue]  
+[4] [public repo merge queue], [private repo merge queue] (for **ARM review** queue, [1])
 
 If you need further help with anything, see `Getting help` section below.
 
@@ -52,16 +52,26 @@ and followed the instructions by checking all the boxes:
 - If you want to force ARM review, add the label yourself.
 - Proceed according to the diagram at the top of this comment.
 
+## Viewing API changes
+
+For convenient view of the API changes made by this PR, refer to the URLs provided in the table 
+in the `Generated ApiView` comment added to this PR. You can use ApiView to show API versions diff. 
+
+## Suppressing failures
+
+If one or multiple validation error/warning suppression(s) is detected in your PR, please follow the 
+[Swagger-Suppression-Process](https://aka.ms/azsdk/pr-suppressions) 
+to get approval.
+
 ## Getting help
 
 - For general PR approval workflow, see the diagram at the top of this comment.
 - For guidance on fixing this PR CI check failures, see the hyperlinks provided in given failure 
   and https://aka.ms/ci-fix.
 - If the help provided by the previous points is not enough, post to https://aka.ms/azsdk/support/specreview-channel and link to this PR.
 
-[public repo review queue]: https://github.com/Azure/azure-rest-api-specs/pulls?q=is%3Aopen+is%3Apr+label%3AWaitForARMFeedback+-label%3AIDCDevDiv+draft%3Afalse+sort%3Acreated-asc
-[private repo review queue]: https://github.com/Azure/azure-rest-api-specs-pr/pulls?q=is%3Aopen+is%3Apr+label%3AWaitForARMFeedback+-label%3AIDCDevDiv+draft%3Afalse+sort%3Acreated-asc
+[ARM review queue]: https://github.com/search?q=org%3AAzure+is%3Apr+is%3Aopen+label%3AWaitForARMFeedback+-label%3AIDCDevDiv++draft%3Afalse+sort%3Acreated-asc+&type=pullrequests
 [List of SDK breaking changes approvers]: https://teams.microsoft.com/l/message/19:[email protected]/1689115217750?tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47&groupId=3e17dcb0-4257-4a30-b843-77f47f1d4121&parentMessageId=1689115217750&teamName=Azure%20SDK&channelName=API%20Spec%20Review&createdTime=1689115217750
-[public repo merge queue]: https://github.com/Azure/azure-rest-api-specs/pulls?q=is%3Aopen+is%3Apr+label%3AMergeRequested+-label%3AIDCDevDiv+draft%3Afalse+sort%3Acreated-asc
-[private repo merge queue]: https://github.com/Azure/azure-rest-api-specs-pr/pulls?q=is%3Aopen+is%3Apr+label%3AMergeRequested+-label%3AIDCDevDiv+draft%3Afalse+sort%3Acreated-asc
+[public repo merge queue]: https://github.com/Azure/azure-rest-api-specs/pulls?q=is%3Aopen+is%3Apr+label%3AMergeRequested+draft%3Afalse+sort%3Acreated-asc
+[private repo merge queue]: https://github.com/Azure/azure-rest-api-specs-pr/pulls?q=is%3Aopen+is%3Apr+label%3AMergeRequested+-label%3AApproved-OkToMerge+draft%3Afalse+sort%3Acreated-asc
 [breaking changes process]: https://eng.ms/docs/cloud-ai-platform/azure-core/azure-core-pm-and-design/trusted-platform-pm-karimb/service-lifecycle-and-actions-team/service-lifecycle-actions-team/apex/media/launchingproductbreakingchanges#breaking-change-process-1

.github/PULL_REQUEST_TEMPLATE/data_plane_template.md

@@ -13,11 +13,23 @@ Is this review for (select one):
 - [ ] 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 API Spec document (if applicable), and the root paths that have been updated. </sup>
 * Design Document:
 * Previous API Spec Doc:
 * Updated paths:
 
+### Viewing API changes
+
+For convenient view of the API changes made by this PR, refer to the URLs provided in the table 
+in the `Generated ApiView` comment added to this PR. You can use ApiView to show API versions diff. 
+
+### Suppressing failures
+
+If one or multiple validation error/warning suppression(s) is detected in your PR, please follow the 
+[Swagger-Suppression-Process](https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/85/Swagger-Suppression-Process) 
+to get approval.
+
 ## ❔Got questions? Need additional info?? We are here to help!
 
 <details>
@@ -33,16 +45,19 @@ The [Azure API Review Board](https://aka.ms/azsdk/onboarding/restapischedule) is
   <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>

.github/comment.yml

@@ -1,65 +1,4 @@
 ---
-- rule:
-    type: label
-    label: BreakingChangeReviewRequired
-    booleanFilterExpression: "!(Approved-OkToMerge)"
-    onLabeledComments: >-
-      Hi @${PRAuthor}! The automation detected breaking changes in this pull request.
-      As a result, it added the `BreakingChangeReviewRequired` label.
-      <br/><br/>
-      You cannot proceed with merging this PR until you complete one of the following action items:
-      <br/><br/>
-      **ACTION ITEM ALTERNATIVE A**: Fix the breaking change. <br/>
-      Please consult the documentation provided in the relevant validation failures.
-      <br/><br/>
-      **ACTION ITEM ALTERNATIVE B**: Request approval. <br/>
-      Alternatively, if you cannot fix the breaking changes, then you can request an approval for them.
-      Please follow the [breaking changes process](https://eng.ms/docs/cloud-ai-platform/azure-core/azure-core-pm-and-design/trusted-platform-pm-karimb/service-lifecycle-and-actions-team/service-lifecycle-actions-team/apex/media/launchingproductbreakingchanges#breaking-change-process-1).
-      <br/>
-      This case applies even if:
-      <ul>
-      <li>The tool fails while it shouldn't, e.g. due to runtime exception, or incorrect detection of breaking changes.
-      </li>
-      <li>You believe there is no need for you to request breaking change approval, for any reason. 
-      Such claims must be reviewed, and the process is the same.
-      </li>
-      </ul>
-
-- rule:
-    type: label
-    label: NewApiVersionRequired
-    booleanFilterExpression: "!(Approved-OkToMerge)"
-    onLabeledComments: >-
-      Hi @${PRAuthor}! The automation detected this pull request introduces changes
-      to at least one existing API version that violate Azure's versioning policy. 
-      To comply with the policy, these changes must be made in a new API version.
-      As a result, the automation added the `NewApiVersionRequired` label.
-      <br/><br/> 
-      You cannot proceed with merging this PR until you complete one of the following action items:
-      <br/><br/>
-      **ACTION ITEM ALTERNATIVE A**: Introduce a new API version. <br/> 
-      Submit a new PR instead of this one, or modify this PR, 
-      so that it adds a new API version instead of introducing changes to existing API versions.
-      <br/><br/>
-      **ACTION ITEM ALTERNATIVE B**: Request approval. <br/>
-      Alternatively, if you cannot avoid modifying existing API versions, 
-      then you can request an approval for them.
-      Please follow the [breaking changes process](https://eng.ms/docs/cloud-ai-platform/azure-core/azure-core-pm-and-design/trusted-platform-pm-karimb/service-lifecycle-and-actions-team/service-lifecycle-actions-team/apex/media/launchingproductbreakingchanges#breaking-change-process-1).
-      <br/>
-      This case applies even if:
-      <ul>
-      <li>The tool fails while it shouldn't, e.g. due to runtime exception, or incorrect detection of breaking changes.
-      </li>
-      <li>You believe there is no need for you to request breaking change approval, for any reason. 
-      Such claims must be reviewed, and the process is the same.
-      </li>
-      </ul>
-
-- rule:
-    type: label
-    label: SuppressionReviewRequired
-    onLabeledComments: "Hi @${PRAuthor}, one or multiple validation error/warning suppression(s) is detected in your PR. Please follow the [Swagger-Suppression-Process](https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/85/Swagger-Suppression-Process) to get approval."
-
 - rule:
     type: label
     label: "CI-MissingBaseCommit"
@@ -105,36 +44,11 @@
     label: ArcReview
     onLabeledComments: "Hi @${PRAuthor} and @arcboard, one or more change(s) have been detected in your Arc enabled VM's or Arc enabled Server's RPs. Please review the changes and ensure that no gaps have been introduced with respect to the ARM API modeling consistency across Azure Arc and Azure Compute. For further details, see guidelines at [Consistency in ARM Modeling](https://msazure.visualstudio.com/One/_wiki/wikis/One.wiki/377428/Consistency-in-ARM-Modeling?anchor=general-design-guidance). To approve the change(s), set the label to ArcSignedOff. If you have any questions, please mail to [email protected]."
 
-- rule:
-    type: label
-    label: CI-FixRequiredOnFailure
-    onLabeledComments: >- 
-      Hi @${PRAuthor}! Your PR has some issues. Please fix the CI issues, **if present**, in following order: `Avocado, SemanticValidation, ModelValidation, Breaking Change, LintDiff`.
-      <br/>
-      <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#lintdiff-validation)</td><td>High</td></tr></table>
-      <br/>
-      If you need further help, please reach out on the Teams channel [aka.ms/azsdk/support/specreview-channel](https://aka.ms/azsdk/support/specreview-channel).
-
 - rule:
     type: label
     label: new-rp-namespace
     onLabeledComments: "Hi, @${PRAuthor}, our workflow has detected that there is no management SDK ever released for your RP, to further process SDK onboard for your RP, you should have the SDK client library name of your RP reviewed and approved. </br> <b>Action Required</b>: <li> Follow this guidance [Naming for new initial management or client libraries (new SDKs) - Overview (azure.com)](https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/821/Naming-for-new-initial-management-or-client-libraries-(new-SDKs)) to create an issue for management client library name arch board review. </li> <li>Paste the issue link that you created in step 1 in this PR</li> </br> <b> Impact</b>: SDK release owner will take the approved management client library name to release SDK. No client library name approval will leads to SDK release delayed."
 
-- rule:
-    type: PROpen
-    variables:
-      openapiHub: https://aka.ms/openapihub
-    onOpenedComments: >- 
-      Hi, @${PRAuthor}! Thank you for your pull request. To help get your PR merged: </br>
-      <li> Ensure you reviewed the checklists in the PR description. </li>
-      <li> Know that PR assignee is the person auto-assigned and responsible for your current PR review and approval. </li>
-      <li> For convenient view of the API changes made by this PR, refer to the URLs provided in the table in
-      the `Generated ApiView` comment added to this PR. You can use ApiView to show API versions diff. </li>
-
 - rule:
     type: checkbox
     keywords: