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

# Conflicts:
#	custom-words.txt

arm-compute/quickstart-templates/aliases.json

@@ -15,18 +15,18 @@
             "sku": "7.5",
             "version": "latest"
           },
-          "CoreOS": {
-            "publisher": "CoreOS",
-            "offer": "CoreOS",
-            "sku": "Stable",
-            "version": "latest"
-          },
           "Debian": {
             "publisher": "Debian",
             "offer": "debian-10",
             "sku": "10",
             "version": "latest"
           },
+          "Flatcar": {
+            "publisher": "kinvolk",
+            "offer": "flatcar-container-linux-free",
+            "sku": "stable",
+            "version": "latest"
+          },
           "openSUSE-Leap": {
             "publisher": "SUSE",
             "offer": "openSUSE-Leap",

azure-pipelines.yml

@@ -19,7 +19,6 @@ variables:
 
 jobs:
 - template: .azure-pipelines/BranchProtectionForPrivateRepo.yml
-- template: .azure-pipelines/Syntax.yml
 - template: .azure-pipelines/NetworkValidation.yml
 - template: .azure-pipelines/Spellcheck.yml
 - template: .azure-pipelines/PrettierCheck.yml

cSpell.json

@@ -39,7 +39,7 @@
         "softwareTerms",
         "typescript"
     ],
-    "overrides": [
+    "overrides": [        
         {
             "filename": "**/specification/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/databox.json",
             "words": [
@@ -70,6 +70,12 @@
                 "Tera"
             ]
         },
+        {
+            "filename": "**/specification/databox/resource-manager/Microsoft.DataBox/stable/2021-05-01/databox.json",
+            "words": [
+                "Tera"
+            ]
+        },
         {
             "filename": "**/specification/servicebus/resource-manager/Microsoft.ServiceBus/stable/2017-04-01/Rules.json",
             "words": [

custom-words.txt

@@ -707,6 +707,7 @@ FQDNs
 Français
 francecentral
 francesouth
+freebsd
 freeflow
 frontdoor
 fsaction
@@ -834,6 +835,7 @@ hotpatching
 HSLA
 HSMs
 Hubspot
+Hugepages
 hybridconnection
 hybriddata
 hybriddatamanager
@@ -857,6 +859,7 @@ IDRG
 IKEV
 ilearner
 iloveyou
+illumos
 IMAGEBUILDER
 Imagelist
 imagelists
@@ -1069,6 +1072,7 @@ machinelearningcompute
 machinelearningexperimentation
 machinelearningservices
 machinewithhints
+madvise
 Magadan
 Magento
 maintenancewindows
@@ -1134,6 +1138,7 @@ minidump
 minimalmetadata
 ministamps
 Minkowski
+mipsle
 mixedreality
 Mkdirs
 mktorest
@@ -1217,6 +1222,7 @@ ndvi
 NDVI
 Neighbourhood
 netapp
+netbsd
 netdev
 Netdev
 netezza
@@ -1225,6 +1231,7 @@ Netfilter
 networkruleset
 networkrulesets
 networkstatus
+networktraversal
 networkwatcher
 newpassword
 newrelapp
@@ -1272,6 +1279,7 @@ nsxt
 ntext
 ntfs
 ntlm
+numa
 numrecords
 nvarchar
 Nynorsk
@@ -1300,6 +1308,7 @@ onpremises
 oobe
 Oozie
 openapi
+openbsd
 opencode
 opencontainers
 openid
@@ -1370,6 +1379,7 @@ phraselist
 phraselists
 Pids
 pipelineruns
+piqd
 PITR
 pixelated
 pkcs
@@ -1439,6 +1449,7 @@ provisioningservices
 provisioningState
 Psec
 PSNR
+pstn
 ptrdname
 publicipaddresses
 publicpreview
@@ -1819,6 +1830,7 @@ streamingendpoint
 streamingjobs
 streamingservice
 subcause
+subcode
 subcomponent
 subcomponents
 subdir
@@ -1924,6 +1936,8 @@ Tful
 Tfvc
 tileset
 tilesets
+timeasc
+timedesc
 timeframe
 timegrain
 timeseries
@@ -1988,6 +2002,7 @@ Undeleting
 unencrypted
 unexamined
 unhide
+unhold
 Unigrams
 uniqueidentifier
 uniquestring
@@ -2130,6 +2145,8 @@ Walser
 WANAs
 WANs
 WASB
+wasm
+Wasm
 watchlist
 Watchlist
 watchlists
@@ -2221,6 +2238,7 @@ Unparented
 scanrulesets
 Ruleset
 Rulesets
+Ruleproperties
 XLSB
 Miti
 DOCM

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

documentation/sdkautomation/README.md

@@ -250,7 +250,7 @@ Output file for generate script.
         "full": "To install something...",
         "lite": "dotnet something"
       },
-      "result": "success"
+      "result": "succeeded"
     }
   ]
 }