Merge remote-tracking branch 'upstream/master'

.azure-pipelines/azure-pipelines-data-container.yml

@@ -3,7 +3,7 @@ schedules:
   displayName: Daily build
   branches:
     include:
-    - master
+    - main
   always: true
 
 pool:

.github/pull_request_assignment.yml

@@ -209,3 +209,4 @@
       - zhenglaizhang
       - chunyu3
       - changlong-liu
+      - msyyc

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

@@ -768,6 +768,14 @@
                 "Fpushpins"
             ]
         },
+        {
+            "filename": "**/specification/maps/data-plane/Render/preview/1.0/render.json",
+            "words": [
+                "Chttp",
+                "Fcontoso",
+                "Fpushpins"
+            ]
+        },
         {
             "filename": "**/specification/communication/data-plane/Chat/preview/2020-09-21-preview2/communicationserviceschat.json",
             "words": [

custom-words.txt

@@ -56,6 +56,7 @@ alertrule
 alertrules
 alertsmanagement
 alertstate
+alibaba
 Alexa
 Algo
 allowlist
@@ -138,6 +139,7 @@ asciifolding
 Asns
 aspnet
 assessmentprojects
+Associable
 Asturian
 asyncinfo
 asyncoperation
@@ -291,6 +293,7 @@ BYOK
 BYOL
 BYOS
 bzip
+byoa
 cacerts
 calculatebaseline
 canadacentral
@@ -702,6 +705,7 @@ FPGA
 fqdn
 FQDNs
 Français
+freebsd
 freeflow
 frontdoor
 fsaction
@@ -791,6 +795,7 @@ Haag
 haase
 Había
 hadoop
+HADR
 hana
 hanaonazure
 Hani
@@ -851,6 +856,7 @@ IDRG
 IKEV
 ilearner
 iloveyou
+illumos
 IMAGEBUILDER
 Imagelist
 imagelists
@@ -934,6 +940,7 @@ jobschedule
 jobscheduler
 jobschedules
 johnc
+JOHNDEERE
 johnsmith
 JSONLD
 Jtoken
@@ -1094,6 +1101,7 @@ maxmemory
 maxpagesize
 maxresults
 MAXSIZE
+maxzoom
 mbaldwin
 Mbps
 MCAS
@@ -1129,6 +1137,8 @@ minidump
 minimalmetadata
 ministamps
 Minkowski
+mipsle
+minzoom
 mixedreality
 Mkdirs
 mktorest
@@ -1210,8 +1220,11 @@ nchar
 ndjson
 ndvi
 NDVI
+ndwi
+NDWI
 Neighbourhood
 netapp
+netbsd
 netdev
 Netdev
 netezza
@@ -1220,6 +1233,7 @@ Netfilter
 networkruleset
 networkrulesets
 networkstatus
+networktraversal
 networkwatcher
 newpassword
 newrelapp
@@ -1294,6 +1308,7 @@ onpremises
 oobe
 Oozie
 openapi
+openbsd
 opencode
 opencontainers
 openid
@@ -1364,6 +1379,7 @@ phraselist
 phraselists
 Pids
 pipelineruns
+piqd
 PITR
 pixelated
 pkcs
@@ -1474,6 +1490,7 @@ RAGZRS
 randint
 Rankable
 rasterize
+rasterized
 ratelimit
 ravbhatnagar
 rawwebsockets
@@ -1593,6 +1610,7 @@ rhel
 RIRs
 rmem
 Rmem
+rmpl
 Rolledback
 Rollforward
 rollouts
@@ -1699,6 +1717,7 @@ sfhealthid
 sfpkg
 shamir_share
 shapefile
+shapefiles
 sharded
 sharedkey
 sharename
@@ -1751,6 +1770,8 @@ southcentralus
 southeastasia
 southindia
 sparkconf
+sparkconfiguration
+sparkconfigurations
 sparkr
 sparql
 SPDX
@@ -1913,8 +1934,12 @@ textanalytics
 TFIDF
 Tful
 Tfvc
+tilejson
 tileset
 tilesets
+timeasc
+timedesc
+timedout
 timeframe
 timegrain
 timeseries
@@ -2118,6 +2143,8 @@ Walser
 WANAs
 WANs
 WASB
+wasm
+Wasm
 watchlist
 Watchlist
 watchlists
@@ -2209,6 +2236,7 @@ Unparented
 scanrulesets
 Ruleset
 Rulesets
+Ruleproperties
 XLSB
 Miti
 DOCM

documentation/openapi-authoring-automated-guidelines.md

@@ -237,15 +237,19 @@ For more capitalization guidance, see: [https://msdn.microsoft.com/en-us/library
 * fooBarBaz
 * resourceKey
 * resourceApiKey
+* publicIPAddress
+* enableSsl
 
 **Bad Examples**: The following would be invalid:
 * PascalCase
 * UpperCamelCase
 * resourceAPIKey
+* enableSSL
 
 **Bad Examples**: The following violate these guidelines but would not be caught by automation: 
 * alllowercase - If there are multiple words, please capitalize starting with the second word
 * miXeDcApItAlIzAtIoN - Please capitalize the first letter of each word (and not seemingly random letters)
+* resourceAPIkey - Automation would incorrectly recognize "Ikey" as a word and not flag the property name
 
 Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rules](#automated-rules) | [ARM](#arm-violations): [Errors](#arm-errors) or [Warnings](#arm-warnings) | [SDK](#sdk-violations): [Errors](#sdk-errors) or [Warnings](#sdk-warnings)
 

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"
     }
   ]
 }