From da01d4c32a22fc3e0f5aa9b80e9368120f685f92 Mon Sep 17 00:00:00 2001 From: Phoenix He Date: Tue, 12 Nov 2019 12:56:35 +0800 Subject: [PATCH 01/37] Update for test --- .azure-pipelines/SDKAutomation.yml | 7 +++-- specificationRepositoryConfiguration.json | 38 +++++++++-------------- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/.azure-pipelines/SDKAutomation.yml b/.azure-pipelines/SDKAutomation.yml index cccf557fcad8..51e9e99229f5 100644 --- a/.azure-pipelines/SDKAutomation.yml +++ b/.azure-pipelines/SDKAutomation.yml @@ -13,9 +13,12 @@ variables: jobs: - job: "SDKAutomation" - displayName: SDK + displayName: SDK Automation pool: - vmImage: 'Ubuntu 18.04' + vmImage: 'Ubuntu 16.04' + container: + image: sdkautomation.azurecr.io/openapi-sdk-automation:ppe + endpoint: sdkautomationv2-registry timeoutInMinutes: 180 variables: diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 31141d585fbe..39fb090d9d71 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -3,25 +3,27 @@ "pipelineName": "automation - sdk", "sdkRepositoryMappings": { "azure-sdk-for-go": { - "integrationRepository": "AzureSDKAutomation/azure-sdk-for-go", - "mainRepository": "Azure/azure-sdk-for-go" + "integrationBranchPrefix": "sdkAutomationPPE", + "generationRepository": "test-repo-tih/azure-sdk-for-go", + "integrationRepository": "test-repo-tih/azure-sdk-for-go", + "mainRepository": "test-repo-arcturus/azure-sdk-for-go" }, "azure-sdk-for-java": { - "integrationRepository": "AzureSDKAutomation/azure-sdk-for-java", - "mainRepository": "Azure/azure-sdk-for-java" + "generationRepository": "test-repo-billy/azure-sdk-for-java", + "mainRepository": "test-repo-billy/azure-sdk-for-java" }, "azure-sdk-for-js": { - "integrationRepository": "AzureSDKAutomation/azure-sdk-for-js", - "mainRepository": "Azure/azure-sdk-for-js" + "generationRepository": "test-repo-billy/azure-sdk-for-js", + "mainRepository": "test-repo-billy/azure-sdk-for-js" }, "azure-sdk-for-net": { - "integrationRepository": "AzureSDKAutomation/azure-sdk-for-net", - "mainRepository": "Azure/azure-sdk-for-net" + "generationRepository": "test-repo-billy/azure-sdk-for-net", + "mainRepository": "test-repo-billy/azure-sdk-for-net" }, "azure-sdk-for-python": { - "integrationRepository": "AzureSDKAutomation/azure-sdk-for-python", - "mainRepository": "Azure/azure-sdk-for-python", - "mainBranch": "release/v3" + "generationRepository": "test-repo-billy/azure-sdk-for-python", + "integrationRepository": "test-repo-billy/azure-sdk-for-python", + "mainRepository": "test-repo-billy/azure-sdk-for-python" }, "azure-sdk-for-python-track2": { "integrationRepository": "AzureSDKAutomation/azure-sdk-for-python", @@ -33,18 +35,8 @@ }, "azure-sdk-for-ruby": { "mainBranch": "latest", - "integrationRepository": "AzureSDKAutomation/azure-sdk-for-ruby", - "mainRepository": "Azure/azure-sdk-for-ruby" - }, - "azure-sdk-for-trenton": { - "integrationRepository": "Azure/azure-sdk-for-trenton", - "mainRepository": "Azure/azure-sdk-for-trenton", - "secondaryRepository": "Azure/azure-sdk-for-trenton", - "secondaryBranch": "secondary" - }, - "azure-resource-manager-schemas": { - "integrationRepository": "AzureSDKAutomation/azure-resource-manager-schemas", - "mainRepository": "Azure/azure-resource-manager-schemas" + "generationRepository": "test-repo-billy/azure-sdk-for-ruby", + "mainRepository": "test-repo-billy/azure-sdk-for-ruby" } } } From 08af3f02f49c2368ebf5f5d583f3950686ac0249 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Mon, 21 Sep 2020 16:35:36 +0800 Subject: [PATCH 02/37] Create readme.azureresourceschema.md --- .../samplefiles/readme.azureresourceschema.md | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 documentation/samplefiles/readme.azureresourceschema.md diff --git a/documentation/samplefiles/readme.azureresourceschema.md b/documentation/samplefiles/readme.azureresourceschema.md new file mode 100644 index 000000000000..e550c54ee38f --- /dev/null +++ b/documentation/samplefiles/readme.azureresourceschema.md @@ -0,0 +1,23 @@ +## AzureResourceSchema + +These settings apply only when `--azureresourceschema` is specified on the command line. + +### AzureResourceSchema multi-api + +```yaml +batch: + - tag: schema-[[ServiceName]]-[[Version]] +``` + + +### Tag: schema-[[Version]] and azureresourceschema + +Please also specify `--azureresourceschema-folder=`. + +```yaml + output-folder: $(azureresourceschema-folder)/schemas + + # all the input files in this apiVersion + input-file: + - [[ResourceProviderName]]/[[ReleaseState]]/[[Version]]/[[ServiceName]].json +``` From affb5f16a9ca65f015f8fdb768d85f1913d18853 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Mon, 21 Sep 2020 16:43:14 +0800 Subject: [PATCH 03/37] Create readme.azureresourceschema.md --- .../samplefiles/readme.azureresourceschema.md | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 documentation/samplefiles/readme.azureresourceschema.md diff --git a/documentation/samplefiles/readme.azureresourceschema.md b/documentation/samplefiles/readme.azureresourceschema.md new file mode 100644 index 000000000000..e550c54ee38f --- /dev/null +++ b/documentation/samplefiles/readme.azureresourceschema.md @@ -0,0 +1,23 @@ +## AzureResourceSchema + +These settings apply only when `--azureresourceschema` is specified on the command line. + +### AzureResourceSchema multi-api + +```yaml +batch: + - tag: schema-[[ServiceName]]-[[Version]] +``` + + +### Tag: schema-[[Version]] and azureresourceschema + +Please also specify `--azureresourceschema-folder=`. + +```yaml + output-folder: $(azureresourceschema-folder)/schemas + + # all the input files in this apiVersion + input-file: + - [[ResourceProviderName]]/[[ReleaseState]]/[[Version]]/[[ServiceName]].json +``` From cf061bbf078a2aaf2e2f765d5691692a9392c32a Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Mon, 21 Sep 2020 16:44:30 +0800 Subject: [PATCH 04/37] Update readme.chsarp.md --- documentation/samplefiles/readme.chsarp.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/documentation/samplefiles/readme.chsarp.md b/documentation/samplefiles/readme.chsarp.md index 965ae218fdcb..5e0a9c182594 100644 --- a/documentation/samplefiles/readme.chsarp.md +++ b/documentation/samplefiles/readme.chsarp.md @@ -1,4 +1,4 @@ -## C# +## C These settings apply only when `--csharp` is specified on the command line. Please also specify `--csharp-sdks-folder=`. @@ -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 ``` From e86efe87096c586eab3ab5f2b65a890205b94798 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Mon, 21 Sep 2020 16:45:18 +0800 Subject: [PATCH 05/37] Update readme.typescript.md --- documentation/samplefiles/readme.typescript.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/samplefiles/readme.typescript.md b/documentation/samplefiles/readme.typescript.md index db7937f5e1bb..0863226f334a 100644 --- a/documentation/samplefiles/readme.typescript.md +++ b/documentation/samplefiles/readme.typescript.md @@ -6,8 +6,8 @@ Please also specify `--typescript-sdks-folder= Date: Mon, 21 Sep 2020 16:46:04 +0800 Subject: [PATCH 06/37] Update readme.ruby.md --- documentation/samplefiles/readme.ruby.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/documentation/samplefiles/readme.ruby.md b/documentation/samplefiles/readme.ruby.md index 13f97a12c69d..b377151aff5e 100644 --- a/documentation/samplefiles/readme.ruby.md +++ b/documentation/samplefiles/readme.ruby.md @@ -3,17 +3,17 @@ These settings apply only when `--ruby` is specified on the command line. ```yaml -package-name: azure_mgmt_YourServiceName -package-version: 2019-12-01 +package-name: azure_mgmt_[[ServiceName]] +package-version: [[Version]] azure-arm: true ``` -### Tag: package-2019-12-01 and ruby +### Tag: package-[[Version]] and ruby -These settings apply only when `--tag=package-2019-12-01 --ruby` is specified on the command line. +These settings apply only when `--tag=package-[[Version]] --ruby` is specified on the command line. Please also specify `--ruby-sdks-folder=`. -```yaml $(tag) == 'package-2019-12-01' && $(ruby) -namespace: Microsoft.YourServiceName -output-folder: $(ruby-sdks-folder)/YourServiceName +```yaml $(tag) == 'package-[[Version]]' && $(ruby) +namespace: [[ResourceProviderName]] +output-folder: $(ruby-sdks-folder)/[[ServiceName]] ``` From 0f8950e52ca103075b8f81e92b67c3f504295bf1 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Mon, 21 Sep 2020 16:46:40 +0800 Subject: [PATCH 07/37] Update readme.go.md --- documentation/samplefiles/readme.go.md | 39 ++++---------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/documentation/samplefiles/readme.go.md b/documentation/samplefiles/readme.go.md index ba38219f4d3e..b5c639c5d82c 100644 --- a/documentation/samplefiles/readme.go.md +++ b/documentation/samplefiles/readme.go.md @@ -8,39 +8,12 @@ go: clear-output-folder: true ``` -### Go multi-api +### Tag: package-[[Version]] and go -``` yaml $(go) && $(multiapi) -batch: - - tag: package-2019-12-01 - - tag: package-2020-07-01-preview - # add every tag listed below -``` - -### Tag: package-2019-12-01 and go - -These settings apply only when `--tag=package-2019-12-01 --go` is specified on the command line. -Please also specify `--go-sdk-folder=`. - -```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=`. +These settings apply only when `--tag=package-[[Version]] --go` is specified on the command line. +Please also specify `--go-sdks-folder=`. -```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]]' && $(go) +namespace: [[ResourceProviderName]] +output-folder: $(go-sdks-folder)/[[ServiceName]]/Generated ``` From 4398fa0eb27136d6f558762f6d9b7cdb31fb1a24 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Mon, 21 Sep 2020 16:47:01 +0800 Subject: [PATCH 08/37] Update readme.python.md --- documentation/samplefiles/readme.python.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/documentation/samplefiles/readme.python.md b/documentation/samplefiles/readme.python.md index f9e093c5a0ec..a7897d6a9011 100644 --- a/documentation/samplefiles/readme.python.md +++ b/documentation/samplefiles/readme.python.md @@ -8,14 +8,14 @@ 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 + namespace: [[ResourceProviderName]] + package-name: [[ServiceName]] + package-version: [[Version]] clear-output-folder: true ``` ```yaml $(python) python: no-namespace-folders: true - output-folder: $(python-sdks-folder)/azure-mgmt/YourServiceName + output-folder: $(python-sdks-folder)/azure-mgmt/[[ServiceName]] ``` From 4f0c4ad25d0d49e76d79e1cc811185fab1517ff5 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Mon, 21 Sep 2020 16:47:28 +0800 Subject: [PATCH 09/37] Update samplereadme.md --- documentation/samplefiles/samplereadme.md | 30 +++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/documentation/samplefiles/samplereadme.md b/documentation/samplefiles/samplereadme.md index f76fab965fc8..28101e3177bb 100644 --- a/documentation/samplefiles/samplereadme.md +++ b/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 ``` --- @@ -55,25 +55,25 @@ swagger-to-sdk: - 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]]'] ``` ## Go -See configuration in [readme.go.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.go.md) +See configuration in [readme.go.md](./readme.go.md) ## Python -See configuration in [readme.python.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.python.md) +See configuration in [readme.python.md](./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) +See configuration in [readme.ruby.md](./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) +See configuration in [readme.typescript.md](./readme.typescript.md) ## CSharp -See configuration in [readme.csharp.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.chsarp.md) +See configuration in [readme.csharp.md](./readme.csharp.md) From 509cbc5b53a871f2afcd342c422f46a9c4006677 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Mon, 21 Sep 2020 16:57:56 +0800 Subject: [PATCH 10/37] Update readme.chsarp.md --- documentation/samplefiles/readme.chsarp.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/samplefiles/readme.chsarp.md b/documentation/samplefiles/readme.chsarp.md index 5e0a9c182594..50f5e3d43933 100644 --- a/documentation/samplefiles/readme.chsarp.md +++ b/documentation/samplefiles/readme.chsarp.md @@ -1,4 +1,4 @@ -## C +## C# These settings apply only when `--csharp` is specified on the command line. Please also specify `--csharp-sdks-folder=`. From 169db53bbf37cda5ad5d77e8eb1b56cbf6782de8 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Mon, 21 Sep 2020 17:00:29 +0800 Subject: [PATCH 11/37] Update samplereadme.md --- documentation/samplefiles/samplereadme.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/documentation/samplefiles/samplereadme.md b/documentation/samplefiles/samplereadme.md index 28101e3177bb..fb416d60d4e6 100644 --- a/documentation/samplefiles/samplereadme.md +++ b/documentation/samplefiles/samplereadme.md @@ -60,20 +60,20 @@ swagger-to-sdk: ## Go -See configuration in [readme.go.md](./readme.go.md) +See configuration in [readme.go.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.go.md) ## Python -See configuration in [readme.python.md](./readme.python.md) +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](./readme.ruby.md) +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](./readme.typescript.md) +See configuration in [readme.typescript.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.typescript.md) ## CSharp -See configuration in [readme.csharp.md](./readme.csharp.md) +See configuration in [readme.csharp.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.chsarp.md) From 4c8bce38cc4d88bd4306144a20094fe949b2fa22 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Mon, 21 Sep 2020 17:05:15 +0800 Subject: [PATCH 12/37] Update readme.chsarp.md --- documentation/samplefiles/readme.chsarp.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/samplefiles/readme.chsarp.md b/documentation/samplefiles/readme.chsarp.md index 965ae218fdcb..50f5e3d43933 100644 --- a/documentation/samplefiles/readme.chsarp.md +++ b/documentation/samplefiles/readme.chsarp.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 ``` From d3918b758561161262a6ee38cc4949ace3904b55 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Mon, 21 Sep 2020 17:06:05 +0800 Subject: [PATCH 13/37] Update readme.python.md --- documentation/samplefiles/readme.python.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/documentation/samplefiles/readme.python.md b/documentation/samplefiles/readme.python.md index f9e093c5a0ec..a7897d6a9011 100644 --- a/documentation/samplefiles/readme.python.md +++ b/documentation/samplefiles/readme.python.md @@ -8,14 +8,14 @@ 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 + namespace: [[ResourceProviderName]] + package-name: [[ServiceName]] + package-version: [[Version]] clear-output-folder: true ``` ```yaml $(python) python: no-namespace-folders: true - output-folder: $(python-sdks-folder)/azure-mgmt/YourServiceName + output-folder: $(python-sdks-folder)/azure-mgmt/[[ServiceName]] ``` From 0920cee0debd41e07f7e20d7237ef9d3f9288deb Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Mon, 21 Sep 2020 17:06:41 +0800 Subject: [PATCH 14/37] Update readme.go.md --- documentation/samplefiles/readme.go.md | 39 ++++---------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/documentation/samplefiles/readme.go.md b/documentation/samplefiles/readme.go.md index ba38219f4d3e..b5c639c5d82c 100644 --- a/documentation/samplefiles/readme.go.md +++ b/documentation/samplefiles/readme.go.md @@ -8,39 +8,12 @@ go: clear-output-folder: true ``` -### Go multi-api +### Tag: package-[[Version]] and go -``` yaml $(go) && $(multiapi) -batch: - - tag: package-2019-12-01 - - tag: package-2020-07-01-preview - # add every tag listed below -``` - -### Tag: package-2019-12-01 and go - -These settings apply only when `--tag=package-2019-12-01 --go` is specified on the command line. -Please also specify `--go-sdk-folder=`. - -```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=`. +These settings apply only when `--tag=package-[[Version]] --go` is specified on the command line. +Please also specify `--go-sdks-folder=`. -```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]]' && $(go) +namespace: [[ResourceProviderName]] +output-folder: $(go-sdks-folder)/[[ServiceName]]/Generated ``` From b2f0bd8a82345487e931177abb2b44948c0d1d93 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Mon, 21 Sep 2020 17:07:18 +0800 Subject: [PATCH 15/37] Update readme.ruby.md --- documentation/samplefiles/readme.ruby.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/documentation/samplefiles/readme.ruby.md b/documentation/samplefiles/readme.ruby.md index 13f97a12c69d..b377151aff5e 100644 --- a/documentation/samplefiles/readme.ruby.md +++ b/documentation/samplefiles/readme.ruby.md @@ -3,17 +3,17 @@ These settings apply only when `--ruby` is specified on the command line. ```yaml -package-name: azure_mgmt_YourServiceName -package-version: 2019-12-01 +package-name: azure_mgmt_[[ServiceName]] +package-version: [[Version]] azure-arm: true ``` -### Tag: package-2019-12-01 and ruby +### Tag: package-[[Version]] and ruby -These settings apply only when `--tag=package-2019-12-01 --ruby` is specified on the command line. +These settings apply only when `--tag=package-[[Version]] --ruby` is specified on the command line. Please also specify `--ruby-sdks-folder=`. -```yaml $(tag) == 'package-2019-12-01' && $(ruby) -namespace: Microsoft.YourServiceName -output-folder: $(ruby-sdks-folder)/YourServiceName +```yaml $(tag) == 'package-[[Version]]' && $(ruby) +namespace: [[ResourceProviderName]] +output-folder: $(ruby-sdks-folder)/[[ServiceName]] ``` From 5a8a71b6fe8aa83828c1f5c8a5bbcd4ce6f9390c Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Mon, 21 Sep 2020 17:07:42 +0800 Subject: [PATCH 16/37] Update readme.typescript.md --- documentation/samplefiles/readme.typescript.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/samplefiles/readme.typescript.md b/documentation/samplefiles/readme.typescript.md index db7937f5e1bb..0863226f334a 100644 --- a/documentation/samplefiles/readme.typescript.md +++ b/documentation/samplefiles/readme.typescript.md @@ -6,8 +6,8 @@ Please also specify `--typescript-sdks-folder= Date: Mon, 21 Sep 2020 17:12:28 +0800 Subject: [PATCH 17/37] Update samplereadme.md --- documentation/samplefiles/samplereadme.md | 25 ++++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/documentation/samplefiles/samplereadme.md b/documentation/samplefiles/samplereadme.md index f76fab965fc8..94f7409a3812 100644 --- a/documentation/samplefiles/samplereadme.md +++ b/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-YYYY-MM-DD 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 ``` --- @@ -54,8 +54,9 @@ swagger-to-sdk: - repo: azure-sdk-for-go - repo: azure-sdk-for-js - repo: azure-sdk-for-ruby + - repo: azure-sdk-for-azureresourceschema after_scripts: - - bundle install && rake arm:regen_all_profiles['azure_mgmt_YourServiceName'] + - bundle install && rake arm:regen_all_profiles['azure_mgmt_[[ServiceName]]'] ``` ## Go @@ -77,3 +78,7 @@ See configuration in [readme.typescript.md](https://github.com/Azure/azure-rest- ## CSharp See configuration in [readme.csharp.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.chsarp.md) + +## AzureResourceSchema + +See configuration in [readme.csharp.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.azureresourceschema.md) From 36bc60cd252582cc1f8de5123aed574d8f0bf3fb Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Mon, 21 Sep 2020 17:13:03 +0800 Subject: [PATCH 18/37] Update readme.python.md --- documentation/samplefiles/readme.python.md | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/documentation/samplefiles/readme.python.md b/documentation/samplefiles/readme.python.md index a7897d6a9011..c8a6b97e7de2 100644 --- a/documentation/samplefiles/readme.python.md +++ b/documentation/samplefiles/readme.python.md @@ -4,18 +4,35 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. ```yaml $(python) +python-mode: create python: azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION payload-flattening-threshold: 2 namespace: [[ResourceProviderName]] - package-name: [[ServiceName]] + package-name: azure-mgmt-[[ServiceName]] package-version: [[Version]] clear-output-folder: true ``` +These settings apply only when `--track2` is specified on the command line. + +```yaml $(python) + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + package-name: azure-mgmt-[[ServiceName]] + no-namespace-folders: true + package-version: [[Version]] +``` + ```yaml $(python) python: no-namespace-folders: true - output-folder: $(python-sdks-folder)/azure-mgmt/[[ServiceName]] + output-folder: $(python-sdks-folder)/[[ServiceName]]/azure-mgmt-[[ServiceName]] +``` + +```yaml $(python) +python: + basic-setup-py: true + output-folder: $(python-sdks-folder)/[[ServiceName]]/azure-mgmt-[[ServiceName]] ``` From 18f08ee0a8501d998e73fee904984b8b78527bb1 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Thu, 24 Sep 2020 10:03:09 +0800 Subject: [PATCH 19/37] Revert "Merge branch 'master' into patch-3" This reverts commit a9b26ac65779c2840d68a13c0a222cf5f7f44417, reversing changes made to 36bc60cd252582cc1f8de5123aed574d8f0bf3fb. --- .azure-pipelines/SDKAutomation.yml | 7 ++--- specificationRepositoryConfiguration.json | 38 ++++++++++++++--------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/.azure-pipelines/SDKAutomation.yml b/.azure-pipelines/SDKAutomation.yml index 64353914917c..4cd770c7861d 100644 --- a/.azure-pipelines/SDKAutomation.yml +++ b/.azure-pipelines/SDKAutomation.yml @@ -13,12 +13,9 @@ variables: jobs: - job: "SDKAutomation" - displayName: SDK Automation + displayName: SDK pool: - vmImage: 'Ubuntu 16.04' - container: - image: sdkautomation.azurecr.io/openapi-sdk-automation:ppe - endpoint: sdkautomationv2-registry + vmImage: 'Ubuntu 18.04' timeoutInMinutes: 180 variables: diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 3b0574011659..23e916da5473 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -3,27 +3,25 @@ "pipelineName": "automation - sdk", "sdkRepositoryMappings": { "azure-sdk-for-go": { - "integrationBranchPrefix": "sdkAutomationPPE", - "generationRepository": "test-repo-tih/azure-sdk-for-go", - "integrationRepository": "test-repo-tih/azure-sdk-for-go", - "mainRepository": "test-repo-arcturus/azure-sdk-for-go" + "integrationRepository": "AzureSDKAutomation/azure-sdk-for-go", + "mainRepository": "Azure/azure-sdk-for-go" }, "azure-sdk-for-java": { - "generationRepository": "test-repo-billy/azure-sdk-for-java", - "mainRepository": "test-repo-billy/azure-sdk-for-java" + "integrationRepository": "AzureSDKAutomation/azure-sdk-for-java", + "mainRepository": "Azure/azure-sdk-for-java" }, "azure-sdk-for-js": { - "generationRepository": "test-repo-billy/azure-sdk-for-js", - "mainRepository": "test-repo-billy/azure-sdk-for-js" + "integrationRepository": "AzureSDKAutomation/azure-sdk-for-js", + "mainRepository": "Azure/azure-sdk-for-js" }, "azure-sdk-for-net": { - "generationRepository": "test-repo-billy/azure-sdk-for-net", - "mainRepository": "test-repo-billy/azure-sdk-for-net" + "integrationRepository": "AzureSDKAutomation/azure-sdk-for-net", + "mainRepository": "Azure/azure-sdk-for-net" }, "azure-sdk-for-python": { - "generationRepository": "test-repo-billy/azure-sdk-for-python", - "integrationRepository": "test-repo-billy/azure-sdk-for-python", - "mainRepository": "test-repo-billy/azure-sdk-for-python" + "integrationRepository": "AzureSDKAutomation/azure-sdk-for-python", + "mainRepository": "Azure/azure-sdk-for-python", + "mainBranch": "release/v3" }, "azure-sdk-for-python-track2": { "integrationRepository": "AzureSDKAutomation/azure-sdk-for-python", @@ -35,8 +33,18 @@ }, "azure-sdk-for-ruby": { "mainBranch": "latest", - "generationRepository": "test-repo-billy/azure-sdk-for-ruby", - "mainRepository": "test-repo-billy/azure-sdk-for-ruby" + "integrationRepository": "AzureSDKAutomation/azure-sdk-for-ruby", + "mainRepository": "Azure/azure-sdk-for-ruby" + }, + "azure-sdk-for-trenton": { + "integrationRepository": "Azure/azure-sdk-for-trenton", + "mainRepository": "Azure/azure-sdk-for-trenton", + "secondaryRepository": "Azure/azure-sdk-for-trenton", + "secondaryBranch": "secondary" + }, + "azure-resource-manager-schemas": { + "integrationRepository": "AzureSDKAutomation/azure-resource-manager-schemas", + "mainRepository": "Azure/azure-resource-manager-schemas" } }, "overrides": { From edaa233db89da0250a0fbe8e9500572a2bdc0947 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Thu, 24 Sep 2020 11:29:55 +0800 Subject: [PATCH 20/37] Update readme.azureresourceschema.md --- documentation/samplefiles/readme.azureresourceschema.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/documentation/samplefiles/readme.azureresourceschema.md b/documentation/samplefiles/readme.azureresourceschema.md index e550c54ee38f..3b7d9a1bd011 100644 --- a/documentation/samplefiles/readme.azureresourceschema.md +++ b/documentation/samplefiles/readme.azureresourceschema.md @@ -9,11 +9,10 @@ batch: - tag: schema-[[ServiceName]]-[[Version]] ``` - -### Tag: schema-[[Version]] and azureresourceschema - Please also specify `--azureresourceschema-folder=`. +### Tag: schema-[[ServiceName]]-[[Version]] and azureresourceschema + ```yaml output-folder: $(azureresourceschema-folder)/schemas From c39635f81a9bcd8791ea203e9b5108b69c93e24e Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Thu, 24 Sep 2020 13:22:05 +0800 Subject: [PATCH 21/37] Update samplereadme.md --- documentation/samplefiles/samplereadme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/documentation/samplefiles/samplereadme.md b/documentation/samplefiles/samplereadme.md index f45a899e14e0..d1816fff9d31 100644 --- a/documentation/samplefiles/samplereadme.md +++ b/documentation/samplefiles/samplereadme.md @@ -54,6 +54,8 @@ swagger-to-sdk: - 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_[[ServiceName]]'] - repo: azure-sdk-for-azureresourceschema after_scripts: - bundle install && rake arm:regen_all_profiles['azure_mgmt_[[ServiceName]]'] From 2bff1e42c6de52ed2a603c9e8bd8f606351849be Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Thu, 24 Sep 2020 13:56:51 +0800 Subject: [PATCH 22/37] Update readme.go.md --- documentation/samplefiles/readme.go.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/documentation/samplefiles/readme.go.md b/documentation/samplefiles/readme.go.md index b5c639c5d82c..52535364fbeb 100644 --- a/documentation/samplefiles/readme.go.md +++ b/documentation/samplefiles/readme.go.md @@ -5,15 +5,23 @@ 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 ``` -### Tag: package-[[Version]] and go +### Go multi-api + +``` yaml $(go) && $(multiapi) +batch: + - tag: package-2020-07 +``` + +### Tag: package-[[Version]]-[[ReleaseState]] and go These settings apply only when `--tag=package-[[Version]] --go` is specified on the command line. Please also specify `--go-sdks-folder=`. -```yaml $(tag) == 'package-[[Version]]' && $(go) +```yaml $(tag) == 'package-[[Version]]-[[ReleaseState]]' && $(go) namespace: [[ResourceProviderName]] -output-folder: $(go-sdks-folder)/[[ServiceName]]/Generated +output-folder: $(go-sdk-folder)/services/[[ReleaseState]]/$(namespace)/mgmt/[[Version]]-[[ReleaseState]]/$(namespace) ``` From 4b22541a20af7ebb1f35211508a0538c1a824c11 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Thu, 24 Sep 2020 13:57:18 +0800 Subject: [PATCH 23/37] Update readme.go.md --- documentation/samplefiles/readme.go.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/samplefiles/readme.go.md b/documentation/samplefiles/readme.go.md index 52535364fbeb..2337763c3902 100644 --- a/documentation/samplefiles/readme.go.md +++ b/documentation/samplefiles/readme.go.md @@ -13,7 +13,7 @@ go: ``` yaml $(go) && $(multiapi) batch: - - tag: package-2020-07 + - tag: package--[[Version]]-[[ReleaseState]] ``` ### Tag: package-[[Version]]-[[ReleaseState]] and go From 297ba9d08f6a35cb1298d9af30ca2e47204727e3 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Thu, 24 Sep 2020 14:05:04 +0800 Subject: [PATCH 24/37] Update readme.go.md --- documentation/samplefiles/readme.go.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/documentation/samplefiles/readme.go.md b/documentation/samplefiles/readme.go.md index 2337763c3902..bb12edba024b 100644 --- a/documentation/samplefiles/readme.go.md +++ b/documentation/samplefiles/readme.go.md @@ -5,7 +5,6 @@ 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 ``` @@ -22,6 +21,6 @@ These settings apply only when `--tag=package-[[Version]] --go` is specified on Please also specify `--go-sdks-folder=`. ```yaml $(tag) == 'package-[[Version]]-[[ReleaseState]]' && $(go) -namespace: [[ResourceProviderName]] +namespace: [[ServiceName]] output-folder: $(go-sdk-folder)/services/[[ReleaseState]]/$(namespace)/mgmt/[[Version]]-[[ReleaseState]]/$(namespace) ``` From c930e691c0996b1684be4422cc1eeafafecdd4ba Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Thu, 24 Sep 2020 16:57:01 +0800 Subject: [PATCH 25/37] Update readme.azureresourceschema.md --- documentation/samplefiles/readme.azureresourceschema.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/documentation/samplefiles/readme.azureresourceschema.md b/documentation/samplefiles/readme.azureresourceschema.md index 3b7d9a1bd011..87a939f25ee6 100644 --- a/documentation/samplefiles/readme.azureresourceschema.md +++ b/documentation/samplefiles/readme.azureresourceschema.md @@ -4,7 +4,7 @@ These settings apply only when `--azureresourceschema` is specified on the comma ### AzureResourceSchema multi-api -```yaml +```yaml $(azureresourceschema) && $(multiapi) batch: - tag: schema-[[ServiceName]]-[[Version]] ``` @@ -13,10 +13,10 @@ Please also specify `--azureresourceschema-folder= Date: Thu, 24 Sep 2020 17:03:29 +0800 Subject: [PATCH 26/37] Update samplereadme.md --- documentation/samplefiles/samplereadme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/samplefiles/samplereadme.md b/documentation/samplefiles/samplereadme.md index d1816fff9d31..a5c6f0d95cab 100644 --- a/documentation/samplefiles/samplereadme.md +++ b/documentation/samplefiles/samplereadme.md @@ -26,7 +26,7 @@ These are the global settings for the [[ServiceName]]. ```yaml openapi-type: [[OpenApiType]] -tag: package-YYYY-MM-DD tag: package-[[Version]] +tag: package-[[Version]] ``` ### Tag: package-[[Version]] @@ -58,7 +58,7 @@ swagger-to-sdk: - bundle install && rake arm:regen_all_profiles['azure_mgmt_[[ServiceName]]'] - repo: azure-sdk-for-azureresourceschema after_scripts: - - bundle install && rake arm:regen_all_profiles['azure_mgmt_[[ServiceName]]'] + - node sdkauto_afterscript.js [[ServiceName]]/resource-manager ``` ## Go From 62067c5ebc8d4dc832821db7763354143986561a Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Thu, 24 Sep 2020 17:05:33 +0800 Subject: [PATCH 27/37] Update samplereadme.md --- documentation/samplefiles/samplereadme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/samplefiles/samplereadme.md b/documentation/samplefiles/samplereadme.md index a5c6f0d95cab..42b0c990116f 100644 --- a/documentation/samplefiles/samplereadme.md +++ b/documentation/samplefiles/samplereadme.md @@ -56,7 +56,7 @@ swagger-to-sdk: - repo: azure-sdk-for-ruby after_scripts: - bundle install && rake arm:regen_all_profiles['azure_mgmt_[[ServiceName]]'] - - repo: azure-sdk-for-azureresourceschema + - repo: azure-resource-manager-schemas after_scripts: - node sdkauto_afterscript.js [[ServiceName]]/resource-manager ``` From 31d3d4ca1b180305183136cf31f1c0a5681d4711 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Sun, 27 Sep 2020 12:18:09 +0800 Subject: [PATCH 28/37] Update readme.python.md --- documentation/samplefiles/readme.python.md | 40 ++++++---------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/documentation/samplefiles/readme.python.md b/documentation/samplefiles/readme.python.md index c8a6b97e7de2..b2b1a23f2003 100644 --- a/documentation/samplefiles/readme.python.md +++ b/documentation/samplefiles/readme.python.md @@ -3,36 +3,18 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. -```yaml $(python) -python-mode: create -python: - azure-arm: true - license-header: MICROSOFT_MIT_NO_VERSION - payload-flattening-threshold: 2 - namespace: [[ResourceProviderName]] - package-name: azure-mgmt-[[ServiceName]] - package-version: [[Version]] - 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 ``` -These settings apply only when `--track2` is specified on the command line. - -```yaml $(python) - azure-arm: true - license-header: MICROSOFT_MIT_NO_VERSION - package-name: azure-mgmt-[[ServiceName]] - no-namespace-folders: true - package-version: [[Version]] -``` - -```yaml $(python) -python: - no-namespace-folders: true - output-folder: $(python-sdks-folder)/[[ServiceName]]/azure-mgmt-[[ServiceName]] +``` yaml $(python-mode) == 'update' +output-folder: $(python-sdks-folder)/[[ServiceName]]/azure-mgmt-[[ServiceName]]/azure/mgmt/[[ServiceName]] ``` - -```yaml $(python) -python: - basic-setup-py: true - output-folder: $(python-sdks-folder)/[[ServiceName]]/azure-mgmt-[[ServiceName]] +``` yaml $(python-mode) == 'create' +basic-setup-py: true +output-folder: $(python-sdks-folder)/[[ServiceName]]/azure-mgmt-[[ServiceName]] ``` From 22e8fafb861185ad8310748d56d538a164a67dd8 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Sun, 27 Sep 2020 17:20:50 +0800 Subject: [PATCH 29/37] Update readme.azureresourceschema.md --- .../samplefiles/readme.azureresourceschema.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/documentation/samplefiles/readme.azureresourceschema.md b/documentation/samplefiles/readme.azureresourceschema.md index 87a939f25ee6..046d4f19febb 100644 --- a/documentation/samplefiles/readme.azureresourceschema.md +++ b/documentation/samplefiles/readme.azureresourceschema.md @@ -4,19 +4,20 @@ These settings apply only when `--azureresourceschema` is specified on the comma ### AzureResourceSchema multi-api -```yaml $(azureresourceschema) && $(multiapi) +``` yaml $(azureresourceschema) && $(multiapi) batch: - tag: schema-[[ServiceName]]-[[Version]] + ``` Please also specify `--azureresourceschema-folder=`. ### Tag: schema-[[ServiceName]]-[[Version]] and azureresourceschema -```yaml $(tag) == 'schema-[[ServiceName]]-[[Version]]' && $(azureresourceschema) - output-folder: $(azureresourceschema-folder)/schemas +``` yaml $(tag) == 'schema-[[ServiceName]]-[[Version]]' && $(azureresourceschema) +output-folder: $(azureresourceschema-folder)/schemas # all the input files in this apiVersion - input-file: - - [[ResourceProviderName]]/[[ReleaseState]]/[[Version]]/[[ServiceName]].json +input-file: + - [[ResourceProviderName]]/[[ReleaseState]]/[[Version]]/[[ServiceName]].json ``` From 1f719d25710cd9ee953ae68a75f193aefbad33cf Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Sun, 27 Sep 2020 17:35:37 +0800 Subject: [PATCH 30/37] Update readme.go.md --- documentation/samplefiles/readme.go.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/samplefiles/readme.go.md b/documentation/samplefiles/readme.go.md index bb12edba024b..81d315bf35d2 100644 --- a/documentation/samplefiles/readme.go.md +++ b/documentation/samplefiles/readme.go.md @@ -18,7 +18,7 @@ batch: ### Tag: package-[[Version]]-[[ReleaseState]] and go These settings apply only when `--tag=package-[[Version]] --go` is specified on the command line. -Please also specify `--go-sdks-folder=`. +Please also specify `--go-sdk-folder=`. ```yaml $(tag) == 'package-[[Version]]-[[ReleaseState]]' && $(go) namespace: [[ServiceName]] From 734cd85ec9fd08ce88c725966b1ac851bd0bc5aa Mon Sep 17 00:00:00 2001 From: Lei Ni <7233663+leni-msft@users.noreply.github.com> Date: Sun, 27 Sep 2020 21:05:45 +0800 Subject: [PATCH 31/37] Update documentation/samplefiles/readme.go.md Co-authored-by: Arcturus --- documentation/samplefiles/readme.go.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/samplefiles/readme.go.md b/documentation/samplefiles/readme.go.md index 81d315bf35d2..03e19edb5a60 100644 --- a/documentation/samplefiles/readme.go.md +++ b/documentation/samplefiles/readme.go.md @@ -12,7 +12,7 @@ go: ``` yaml $(go) && $(multiapi) batch: - - tag: package--[[Version]]-[[ReleaseState]] + - tag: package-[[Version]] ``` ### Tag: package-[[Version]]-[[ReleaseState]] and go From 90d3ff51c3d61286d442c7a9da27f3c8d90675f2 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Mon, 28 Sep 2020 14:30:15 +0800 Subject: [PATCH 32/37] Update readme.typescript.md --- documentation/samplefiles/readme.typescript.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/documentation/samplefiles/readme.typescript.md b/documentation/samplefiles/readme.typescript.md index 0863226f334a..3f8b8a5d43ec 100644 --- a/documentation/samplefiles/readme.typescript.md +++ b/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=`. -```yaml $(typescript) +``` yaml $(typescript) typescript: azure-arm: true - package-name: "[[ServiceName]]" - output-folder: "$(typescript-sdks-folder)/packages/[[ServiceName]]" + package-name: "@azure/arm-[[ServiceName]]" + output-folder: "$(typescript-sdks-folder)/[[ServiceName]]/arm-[[ServiceName]]" payload-flattening-threshold: 1 + clear-output-folder: true generate-metadata: true ``` From b2fdfb1aab165cb48b1ca534a2e3203b39c93635 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Mon, 28 Sep 2020 16:15:23 +0800 Subject: [PATCH 33/37] Delete readme.ruby.md --- documentation/samplefiles/readme.ruby.md | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 documentation/samplefiles/readme.ruby.md diff --git a/documentation/samplefiles/readme.ruby.md b/documentation/samplefiles/readme.ruby.md deleted file mode 100644 index b377151aff5e..000000000000 --- a/documentation/samplefiles/readme.ruby.md +++ /dev/null @@ -1,19 +0,0 @@ -## Ruby - -These settings apply only when `--ruby` is specified on the command line. - -```yaml -package-name: azure_mgmt_[[ServiceName]] -package-version: [[Version]] -azure-arm: true -``` - -### Tag: package-[[Version]] and ruby - -These settings apply only when `--tag=package-[[Version]] --ruby` is specified on the command line. -Please also specify `--ruby-sdks-folder=`. - -```yaml $(tag) == 'package-[[Version]]' && $(ruby) -namespace: [[ResourceProviderName]] -output-folder: $(ruby-sdks-folder)/[[ServiceName]] -``` From 431874b4c7033b143225f7597d4a037d0ba20927 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Wed, 30 Sep 2020 19:58:26 +0800 Subject: [PATCH 34/37] Update readme.go.md --- documentation/samplefiles/readme.go.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/documentation/samplefiles/readme.go.md b/documentation/samplefiles/readme.go.md index 03e19edb5a60..8b12e08878d5 100644 --- a/documentation/samplefiles/readme.go.md +++ b/documentation/samplefiles/readme.go.md @@ -5,6 +5,7 @@ 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 ``` @@ -12,15 +13,14 @@ go: ``` yaml $(go) && $(multiapi) batch: - - tag: package-[[Version]] + - tag: package-[[Version]][[-ReleaseState]] ``` -### Tag: package-[[Version]]-[[ReleaseState]] and go +### Tag: package-[[Version]][[-ReleaseState]] and go -These settings apply only when `--tag=package-[[Version]] --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=`. -```yaml $(tag) == 'package-[[Version]]-[[ReleaseState]]' && $(go) -namespace: [[ServiceName]] -output-folder: $(go-sdk-folder)/services/[[ReleaseState]]/$(namespace)/mgmt/[[Version]]-[[ReleaseState]]/$(namespace) +```yaml $(tag) == 'package-[[Version]][[-ReleaseState]]' && $(go) +output-folder: $(go-sdk-folder)/services[[/ReleaseState]]/$(namespace)/mgmt/[[Version]]/$(namespace) ``` From 023e70caf995bbfa76622e73359e0885ff054281 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Fri, 23 Oct 2020 15:48:34 +0800 Subject: [PATCH 35/37] Update readme.typescript.md add /sdk/ --- documentation/samplefiles/readme.typescript.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/samplefiles/readme.typescript.md b/documentation/samplefiles/readme.typescript.md index 3f8b8a5d43ec..05396d5d5f70 100644 --- a/documentation/samplefiles/readme.typescript.md +++ b/documentation/samplefiles/readme.typescript.md @@ -7,7 +7,7 @@ Please also specify `--typescript-sdks-folder= Date: Fri, 23 Oct 2020 15:50:21 +0800 Subject: [PATCH 36/37] Rename readme.chsarp.md to readme.csharp.md --- documentation/samplefiles/{readme.chsarp.md => readme.csharp.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename documentation/samplefiles/{readme.chsarp.md => readme.csharp.md} (100%) diff --git a/documentation/samplefiles/readme.chsarp.md b/documentation/samplefiles/readme.csharp.md similarity index 100% rename from documentation/samplefiles/readme.chsarp.md rename to documentation/samplefiles/readme.csharp.md From cc20458d5b1e09eb8329795d26e97a528e426867 Mon Sep 17 00:00:00 2001 From: Tianen <347142915@qq.com> Date: Mon, 26 Oct 2020 10:55:28 +0800 Subject: [PATCH 37/37] Update samplereadme.md --- documentation/samplefiles/samplereadme.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/documentation/samplefiles/samplereadme.md b/documentation/samplefiles/samplereadme.md index 42b0c990116f..bb885caab276 100644 --- a/documentation/samplefiles/samplereadme.md +++ b/documentation/samplefiles/samplereadme.md @@ -53,7 +53,6 @@ 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_[[ServiceName]]'] - repo: azure-resource-manager-schemas @@ -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)