Merge pull request #13 from Azure/main

Merge master
yuzhangyi · Feb 21, 2022 · c49bd04 · c49bd04
2 parents 0553013 + 2033a83
commit c49bd04
Show file tree

Hide file tree

Showing 1,017 changed files with 126,990 additions and 1,039 deletions.
diff --git a/.github/comment.yml b/.github/comment.yml
@@ -48,7 +48,7 @@
       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. vsswagger@microsoft.com"
+    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. vscswagger@microsoft.com"
 
 - rule:
     type: PROpen

diff --git a/.github/pull_request_assignment.yml b/.github/pull_request_assignment.yml
@@ -145,6 +145,12 @@
     reviewers:
       - weidongxu-microsoft
 
+- rule:
+    paths: 
+      - "specification/securityinsights/**"
+    reviewers:
+      - dw511214992
+
 
 - rule:
     paths:

diff --git a/custom-words.txt b/custom-words.txt
@@ -1185,6 +1185,7 @@ marketplacecatalog
 marketplaceordering
 maxclients
 maxcoordinates
+MAXDOP
 MAXERRORS
 maxfragmentationmemory
 maximumblobsize
@@ -2479,4 +2480,22 @@ loadtest
 xvalue
 yvalue
 servermetrics
-IAASVM
+napt
+Napt
+NAPT
+Plmn
+IMSI
+UE's
+Preemptable
+Ambr
+AMBR
+rfsp
+Rfsp
+snssai
+Snssai
+NSSAI
+Tbps
+Vuln
+IAASVM
+Quickbase
+Smartsheet
diff --git a/documentation/x-ms-examples.md b/documentation/x-ms-examples.md
@@ -57,7 +57,7 @@ _This will keep the spec cleaner and easy to manage._
 
 ## Structure of the extension
 - **How the extension would look in the swagger spec?**
-  - JSON schema for the extension can be found [here](https://github.com/Azure/autorest/blob/master/packages/libs/autorest-schemas/swagger-extensions.json#L1903-L1916).
+  - JSON schema for the extension can be found [here](https://github.com/Azure/autorest/blob/main/packages/libs/autorest-schemas/swagger-extensions.json#L1844-L1858).
 ```json5
 {
   "info": { ... },
@@ -79,7 +79,7 @@ _This will keep the spec cleaner and easy to manage._
 }
 ```
 - **Skeleton/Schema of the example provided in an individual example (json) file**
-  - The JSON schema for the content to be provided in the example file can be found [here](https://github.com/Azure/autorest/blob/master/packages/libs/autorest-schemas/example-schema.json).
+  - The JSON schema for the content to be provided in the example file can be found [here](https://github.com/Azure/autorest/blob/main/packages/libs/autorest-schemas/example-schema.json).
 ```json5
 "x-ms-examples": {
   "example-name": { //Name of the example/scenario.  It is free-form text and should succinctly describe the scenario.

diff --git a/...ft.ApiManagement/stable/2021-08-01/examples/ApiManagementGetPrivateLinkGroupResource.json b/...ft.ApiManagement/stable/2021-08-01/examples/ApiManagementGetPrivateLinkGroupResource.json
@@ -9,16 +9,16 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/privateLinkResources/privateLinkSubResourceName",
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/privateLinkResources/Gateway",
         "name": "Gateway",
         "type": "Microsoft.ApiManagement/service/privateLinkResources",
         "properties": {
           "groupId": "Gateway",
           "requiredMembers": [
-            "Gateway_west_us"
+            "Gateway"
           ],
           "requiredZoneNames": [
-            "privateLink.azure.api.net"
+            "privateLink.azure-api.net"
           ]
         }
       }

diff --git a/....ApiManagement/stable/2021-08-01/examples/ApiManagementListPrivateLinkGroupResources.json b/....ApiManagement/stable/2021-08-01/examples/ApiManagementListPrivateLinkGroupResources.json
@@ -16,10 +16,10 @@
             "properties": {
               "groupId": "Gateway",
               "requiredMembers": [
-                "Gateway_west_us"
+                "Gateway"
               ],
               "requiredZoneNames": [
-                "privateLink.azure.api.net"
+                "privateLink.azure-api.net"
               ]
             }
           }