Merge remote-tracking branch 'origin/master' into dupe_recoveryservices

.github/issue_assignment.yml

@@ -18,4 +18,4 @@
       - leni-msft
       - qianwens
       - ruowan
-      - MyronFanQiu
+

custom-words.txt

@@ -122,6 +122,7 @@ aspnet
 asyncinfo
 asyncoperation
 atascada
+attestationcollateral
 Auditd
 australiaeast
 australiasoutheast
@@ -760,6 +761,7 @@ Informations
 Informix
 Ingestor
 ingressed
+inittime
 inkrecognizer
 inlinecount
 inlines
@@ -999,6 +1001,8 @@ Monospace
 mountainview
 MPNS
 MRAN
+mrenclave
+mrsigner
 MSAZR
 MSAZRDE
 MSCONCAT
@@ -1194,6 +1198,7 @@ Plex
 Pohlmann
 pois
 policyassignments
+policycertificates
 policydefinitions
 policyinsights
 policykey

documentation/samplefiles/readme.azureresourceschema.md

@@ -6,19 +6,18 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 
 ``` yaml $(azureresourceschema) && $(multiapi)
 batch:
-  - tag: schema-yourservicename-YYYY-MM-DD
-
+  - tag: schema-[[ServiceName]]-[[Version]]
+  
 ```
 
 Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
 
-### Tag: schema-yourservicename-YYYY-MM-DD and azureresourceschema
+### Tag: schema-[[ServiceName]]-[[Version]] and azureresourceschema
 
-``` yaml $(tag) == 'schema-yourservicename-YYYY-MM-DD' && $(azureresourceschema)
+``` yaml $(tag) == 'schema-[[ServiceName]]-[[Version]]' && $(azureresourceschema)
 output-folder: $(azureresourceschema-folder)/schemas
 
 # all the input files in this apiVersion
 input-file:
-  - Microsoft.YourServiceName/stable/YYYY-MM-DD/YourServiceName.json
-
+  - [[ResourceProviderName]]/[[ReleaseState]]/[[Version]]/[[ServiceName]].json
 ```

documentation/samplefiles/readme.chsarp.md → documentation/samplefiles/readme.csharp.md

@@ -10,6 +10,6 @@ csharp:
   payload-flattening-threshold: 1
   clear-output-folder: true
   client-side-validation: false
-  namespace: Microsoft.YourServiceName
-  output-folder: $(csharp-sdks-folder)/YourServiceName/management/Microsoft.YourServiceName/GeneratedProtocol
+  namespace: [[ResourceProviderName]]
+  output-folder: $(csharp-sdks-folder)/[[ServiceName]]/management/[[ResourceProviderName]]/GeneratedProtocol
 ```

documentation/samplefiles/readme.go.md

@@ -5,42 +5,22 @@ These settings apply only when `--go` is specified on the command line.
 ```yaml $(go)
 go:
   license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: [[ServiceName]]
   clear-output-folder: true
 ```
 
 ### Go multi-api
 
 ``` yaml $(go) && $(multiapi)
 batch:
-  - tag: package-2019-12-01
-  - tag: package-2020-07-01-preview
-  # add every tag listed below
+  - tag: package-[[Version]][[-ReleaseState]]
 ```
 
-### Tag: package-2019-12-01 and go
+### Tag: package-[[Version]][[-ReleaseState]] and go
 
-These settings apply only when `--tag=package-2019-12-01 --go` is specified on the command line.
+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-2019-12-01' && $(go)
-# NOTE: a stable tag must not contain any preview swagger files included
-# NOTE: go namespace can only consist of lower case letters, numbers and underscores
-namespace: yourservicename
-# NOTE: for special cases, you can hard code the namespace in the output-folder
-# NOTE: the output-folder of a stable tag must not be under the preview subdirectory
-output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2019-12-01/$(namespace)
-```
-
-### Tag: package-2020-07-01-preview and go
-
-These settings apply only when `--tag=package-2020-07-01-preview --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-2020-07-01-preview' && $(go)
-# NOTE: a preview tag must not contain at least one preview swagger file included
-# NOTE: go namespace can only consist of lower case letters, numbers and underscores
-namespace: yourservicename
-# NOTE: a preview api-version must be under the preview sub-directory 
-# NOTE: the output-folder of a preview tag must be under the preview subdirectory
-output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2020-07-01-preview/$(namespace)
+```yaml $(tag) == 'package-[[Version]][[-ReleaseState]]' && $(go)
+output-folder: $(go-sdk-folder)/services[[/ReleaseState]]/$(namespace)/mgmt/[[Version]]/$(namespace)
 ```

documentation/samplefiles/readme.python.md

@@ -3,19 +3,18 @@
 These settings apply only when `--python` is specified on the command line.
 Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
 
-```yaml $(python)
-python:
-  azure-arm: true
-  license-header: MICROSOFT_MIT_NO_VERSION
-  payload-flattening-threshold: 2
-  namespace: Microsoft.YourServiceName
-  package-name: YourServiceName
-  package-version: 2019-12-01
-  clear-output-folder: true
+``` yaml $(python)
+azure-arm: true
+license-header: MICROSOFT_MIT_NO_VERSION
+package-name: azure-mgmt-[[ServiceName]]
+no-namespace-folders: true
+package-version: 1.0.0b1
 ```
 
-```yaml $(python)
-python:
-  no-namespace-folders: true
-  output-folder: $(python-sdks-folder)/azure-mgmt/YourServiceName
+``` yaml $(python-mode) == 'update'
+output-folder: $(python-sdks-folder)/[[ServiceName]]/azure-mgmt-[[ServiceName]]/azure/mgmt/[[ServiceName]]
+```
+``` yaml $(python-mode) == 'create'
+basic-setup-py: true
+output-folder: $(python-sdks-folder)/[[ServiceName]]/azure-mgmt-[[ServiceName]]
 ```

documentation/samplefiles/readme.typescript.md

@@ -3,11 +3,12 @@
 These settings apply only when `--typescript` is specified on the command line.
 Please also specify `--typescript-sdks-folder=<path to root folder of your azure-sdk-for-js clone>`.
 
-```yaml $(typescript)
+``` yaml $(typescript)
 typescript:
   azure-arm: true
-  package-name: "YourServiceName"
-  output-folder: "$(typescript-sdks-folder)/packages/YourServiceName"
+  package-name: "@azure/arm-[[ServiceName]]"
+  output-folder: "$(typescript-sdks-folder)/sdk/[[ServiceName]]/arm-[[ServiceName]]"
   payload-flattening-threshold: 1
+  clear-output-folder: true
   generate-metadata: true
 ```

documentation/samplefiles/samplereadme.md

@@ -1,8 +1,8 @@
-# YourServiceName
+# [[ServiceName]]
 
 > see https://aka.ms/autorest
 
-This is the AutoRest configuration file for YourServiceName.
+This is the AutoRest configuration file for [[ServiceName]].
 
 ## Getting Started
 
@@ -22,20 +22,20 @@ For other options on installation see [Installing AutoRest](https://aka.ms/autor
 
 ### Basic Information
 
-These are the global settings for the YourServiceName.
+These are the global settings for the [[ServiceName]].
 
 ```yaml
-openapi-type: arm
-tag: package-YYYY-MM-DD
+openapi-type: [[OpenApiType]]
+tag: package-[[Version]]
 ```
 
-### Tag: package-YYYY-MM-DD
+### Tag: package-[[Version]]
 
-These settings apply only when `--tag=package-YYYY-MM-DD` is specified on the command line.
+These settings apply only when `--tag=package-[[Version]]` is specified on the command line.
 
-```yaml $(tag) == 'package-YYYY-MM-DD'
+```yaml $(tag) == 'package-[[Version]]'
 input-file:
-  - Microsoft.YourServiceName/stable/YYYY-MM-DD/YourServiceName.json
+  - [[ResourceProviderName]]/[[ReleaseState]]/[[Version]]/[[ServiceName]].json
 ```
 
 ---
@@ -53,12 +53,11 @@ swagger-to-sdk:
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-js
-  - repo: azure-sdk-for-ruby
     after_scripts:
-      - bundle install && rake arm:regen_all_profiles['azure_mgmt_YourServiceName']
+      - bundle install && rake arm:regen_all_profiles['azure_mgmt_[[ServiceName]]']
   - repo: azure-resource-manager-schemas
     after_scripts:
-      - node sdkauto_afterscript.js yourservicename/resource-manager
+      - node sdkauto_afterscript.js [[ServiceName]]/resource-manager
 ```
 
 ## Go
@@ -69,10 +68,6 @@ See configuration in [readme.go.md](https://github.com/Azure/azure-rest-api-spec
 
 See configuration in [readme.python.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.python.md)
 
-## Ruby
-
-See configuration in [readme.ruby.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.ruby.md)
-
 ## TypeScript
 
 See configuration in [readme.typescript.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.typescript.md)