Merge remote-tracking branch 'upstream/main' into kaihui-nm-test

Author: 00Kai0

.github/pull_request_assignment.yml

@@ -95,7 +95,6 @@
     paths: "specification/compute/**"
     reviewers:
       - ArcturusZhang
-      - yungezz
 
 - rule:
     paths:

azure-rest-api-specs

@@ -0,0 +1 @@
+Subproject commit c6c46a85babe68ad27f626bc40007e1556ec8fa1

cSpell.json

@@ -76,6 +76,12 @@
                 "Tera"
             ]
         },
+        {
+            "filename": "**/specification/databox/resource-manager/Microsoft.DataBox/preview/2021-08-01-preview/databox.json",
+            "words": [
+                "Tera"
+            ]
+        },
         {
             "filename": "**/specification/servicebus/resource-manager/Microsoft.ServiceBus/stable/2017-04-01/Rules.json",
             "words": [

custom-words.txt

@@ -146,6 +146,7 @@ asyncinfo
 asyncoperation
 atascada
 attestationcollateral
+attributerule
 audiodata
 Auditd
 australiacentral
@@ -517,6 +518,7 @@ Deallocates
 deallocating
 Deallocation
 debugsend
+decisionrule
 decodable
 Decompounder
 dedicatedhsm
@@ -1019,6 +1021,7 @@ koreacentral
 koreasouth
 Kpis
 Kraaij
+Krustlet
 Ksettings
 kstem
 kube
@@ -1091,6 +1094,7 @@ localmapview
 localrun
 localsearch
 Lockdown
+managedidentity
 loganalytics
 loggerid
 logio
@@ -1139,8 +1143,10 @@ mariadb
 Marketo
 marketplaceagreementsapi
 marketplaceordering
+maxclients
 maxcoordinates
 MAXERRORS
+maxfragmentationmemory
 maximumblobsize
 maxmemory
 maxpagesize
@@ -1458,6 +1464,7 @@ policydefinitions
 policyid
 policyinsights
 policykey
+policyset
 policysets
 Polybase
 polyfill
@@ -1650,6 +1657,7 @@ reservationorders
 resetapikey
 resetconnection
 resetdocs
+resetskills
 resetvpnclientsharedkey
 Resolvability
 resourcegraph
@@ -1690,6 +1698,7 @@ Rolledback
 Rollforward
 rollouts
 rolloverdetails
+rollupby
 rootfs
 rosettanetprocessconfigurations
 rotatediskencryptionkey
@@ -1729,6 +1738,7 @@ salesforcetables
 saling
 salinuxvm
 saml
+saskey
 SAQL
 SASL
 SAWA
@@ -2251,6 +2261,7 @@ WANs
 WASB
 wasm
 Wasm
+wasmtime
 watchlist
 Watchlist
 watchlists
@@ -2358,3 +2369,6 @@ serviceTagChangeNumber
 Tebibytes
 privatelinkservicesforpowerbi
 Obuscated
+NodePool
+hnsonmigration
+aborthnsonmigration

documentation/samplefiles/readme.go.md

@@ -2,25 +2,10 @@
 
 These settings apply only when `--go` is specified on the command line.
 
-```yaml $(go)
-go:
-  license-header: MICROSOFT_MIT_NO_VERSION
-  namespace: [[ServiceName]]
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-[[Version]][[-ReleaseState]]
-```
-
-### Tag: package-[[Version]][[-ReleaseState]] and go
-
-These settings apply only when `--tag=package-[[Version]][[-ReleaseState]] --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-```yaml $(tag) == 'package-[[Version]][[-ReleaseState]]' && $(go)
-output-folder: $(go-sdk-folder)/services[[/ReleaseState]]/$(namespace)/mgmt/[[Version]]/$(namespace)
+```yaml $(go) && $(track2)
+azure-arm: true
+license-header: MICROSOFT_MIT_NO_VERSION
+module-name: sdk/[[ServiceName]]/arm[[ServiceName]]
+module: github.com/Azure/azure-sdk-for-go/$(module-name)
+output-folder: $(go-sdk-folder)/$(module-name)
 ```

documentation/samplefiles/samplereadme.md

@@ -51,7 +51,7 @@ This is not used by Autorest itself.
 swagger-to-sdk:
   - repo: azure-sdk-for-python-track2
   - repo: azure-sdk-for-java
-  - repo: azure-sdk-for-go
+  - repo: azure-sdk-for-go-track2
   - repo: azure-sdk-for-js
   - repo: azure-resource-manager-schemas
   - repo: azure-cli-extensions

profile/2020-09-01-hybrid.json

@@ -583,6 +583,70 @@
           "path": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/ResourceProvider.json"
         }
       ]
+    },
+    "microsoft.containerregistry" : {
+      "2019-05-01": [
+        {
+          "resourceType": "registries",
+          "path" : "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-05-01/containerregistry.json"
+        },
+        {
+          "resourceType": "registries/importImage",
+          "path" : "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-05-01/containerregistry.json"
+        },
+        {
+          "resourceType": "registries/webhooks",
+          "path" : "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-05-01/containerregistry.json"
+        },
+        {
+          "resourceType": "registries/webhooks/ping",
+          "path" : "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-05-01/containerregistry.json"
+        },
+        {
+          "resourceType": "registries/webhooks/getCallbackConfig",
+          "path" : "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-05-01/containerregistry.json"
+        },
+        {
+          "resourceType": "registries/webhooks/listEvents",
+          "path" : "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-05-01/containerregistry.json"
+        },
+        {
+          "resourceType": "registries/listCredentials",
+          "path" : "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-05-01/containerregistry.json"
+        },
+        {
+          "resourceType": "registries/regenerateCredential",
+          "path" : "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-05-01/containerregistry.json"
+        },
+        {
+          "resourceType": "checkNameAvailability",
+          "path" : "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-05-01/containerregistry.json"
+        },
+        {
+          "resourceType": "operations",
+          "path" : "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-05-01/containerregistry.json"
+        }
+      ]
+    },
+    "microsoft.containerservice" : {
+      "2020-11-01": [
+        {
+          "resourceType": "managedclusters",
+          "path" : "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-11-01/managedClusters.json"
+        }
+      ],
+      "2019-04-01": [
+        {
+          "resourceType": "locations/orchestrators",
+          "path" : "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/location.json"
+        }
+      ],
+      "2017-07-01": [
+        {
+          "resourceType": "containerServices",
+          "path" : "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2017-07-01/containerService.json"
+        }
+      ]
     }
   },
   "data-plane": {
@@ -594,6 +658,14 @@
         }
       ]
     },
+    "microsoft.containerregistry": {
+      "2019-08-15-preview": [
+        {
+          "resourceType": "*",
+          "path": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2019-08-15/containerregistry.json"
+        }
+      ]
+    },
     "microsoft.storage": {
       "resourceType": "*",
       "2019-07-07": []

profiles/definitions/latest-2019-04-30.md

@@ -41,6 +41,21 @@ profiles:
           - managedClusters/accessProfiles
         '2017-07-01':
           - containerServices
+      microsoft.blockchain:
+        '2018-06-01-preview':
+          - blockchainMembers
+          - blockchainMembers/consortiumMembers
+          - blockchainMembers/listApiKeys
+          - lockchainMembers/regenerateApiKeys
+          - blockchainMembers/transactionNodes
+          - blockchainMembers/transactionNodes/listApiKeys
+          - blockchainMembers/transactionNodes/regenerateApiKeys
+          - locations
+          - locations/blockchainMemberOperationResults
+          - locations/checkNameAvailability
+          - locations/listConsortiums
+          - operations
+          - skus
       microsoft.capacity:
         '2019-04-01':
           - appliedReservations