From ce623cf65f72a53a7aa9300085675139a04c1d9f Mon Sep 17 00:00:00 2001 From: Alancere <804873052@qq.com> Date: Thu, 21 Apr 2022 10:25:12 +0800 Subject: [PATCH 1/7] [Go] Add batch tag 04/21/22 --- specification/network/resource-manager/readme.go.md | 10 ++++++++++ .../reservations/resource-manager/readme.go.md | 10 ++++++++++ .../servicelinker/resource-manager/readme.go.md | 11 +++++++++++ 3 files changed, 31 insertions(+) diff --git a/specification/network/resource-manager/readme.go.md b/specification/network/resource-manager/readme.go.md index aef1b12a06ed..5879533cdb2f 100644 --- a/specification/network/resource-manager/readme.go.md +++ b/specification/network/resource-manager/readme.go.md @@ -21,6 +21,7 @@ azure-arm: true ``` yaml $(go) && $(multiapi) batch: + - tag: package-2021-08 - tag: package-2021-05 - tag: package-2021-03 - tag: package-2021-02-preview @@ -55,6 +56,15 @@ batch: - tag: package-2015-06split ``` +### Tag: package-2021-08 and go + +These settings apply only when `--tag=package-2021-08 --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +``` yaml $(tag) == 'package-2021-08' && $(go) +output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2021-08-01/$(namespace) +``` + ### Tag: package-2021-05 and go These settings apply only when `--tag=package-2021-05 --go` is specified on the command line. diff --git a/specification/reservations/resource-manager/readme.go.md b/specification/reservations/resource-manager/readme.go.md index e9dd5dc7fc94..3d3967d703c3 100644 --- a/specification/reservations/resource-manager/readme.go.md +++ b/specification/reservations/resource-manager/readme.go.md @@ -21,6 +21,7 @@ azure-arm: true ``` yaml $(go) && $(multiapi) batch: + - tag: package-2022-03 - tag: package-2021-07-01 - tag: package-2020-10-25 - tag: package-preview-2019-07-19 @@ -29,6 +30,15 @@ batch: - tag: package-2017-11 ``` +### Tag: package-2022-03 and go + +These settings apply only when `--tag=package-2022-03 --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +``` yaml $(tag)=='package-2022-03' && $(go) +output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2022-03-01/$(namespace) +``` + ### Tag: package-2021-07-01 and go These settings apply only when `--tag=package-2021-07-01 --go` is specified on the command line. diff --git a/specification/servicelinker/resource-manager/readme.go.md b/specification/servicelinker/resource-manager/readme.go.md index 7cbfa4f449b5..8b8c7ffc1707 100644 --- a/specification/servicelinker/resource-manager/readme.go.md +++ b/specification/servicelinker/resource-manager/readme.go.md @@ -20,9 +20,20 @@ azure-arm: true ``` yaml $(go) && $(multiapi) batch: + - tag: package-2022-05-01 - tag: package-2021-11-01-preview ``` +### Tag: package-2022-05-01 and go + +These settings apply only when `--tag=package-2022-05-01 --go` is specified on the command line. +Please also specify `--go-sdks-folder=`. + +```yaml $(tag) == 'package-2022-05-01' && $(go) +namespace: servicelinker +output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2022-05-01/$(namespace) +``` + ### Tag: package-2021-11-01-preview and go These settings apply only when `--tag=package-2021-11-01-preview --go` is specified on the command line. From c9417c80bbf22007025eb76dbd6ebd5d5571a565 Mon Sep 17 00:00:00 2001 From: Alancere <804873052@qq.com> Date: Thu, 21 Apr 2022 11:28:18 +0800 Subject: [PATCH 2/7] resources/armchanges --- specification/resources/resource-manager/readme.go.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/specification/resources/resource-manager/readme.go.md b/specification/resources/resource-manager/readme.go.md index 8d5e6f48575b..42ba1bdeee0d 100644 --- a/specification/resources/resource-manager/readme.go.md +++ b/specification/resources/resource-manager/readme.go.md @@ -92,6 +92,14 @@ output-folder: $(go-sdk-folder)/$(module-name) azure-arm: true ``` +``` yaml $(go) && $(track2) && $(package-changes) +license-header: MICROSOFT_MIT_NO_VERSION +module-name: sdk/resourcemanager/resources/armchanges +module: github.com/Azure/azure-sdk-for-go/$(module-name) +output-folder: $(go-sdk-folder)/$(module-name) +azure-arm: true +``` + ### Go multi-api ``` yaml $(go) && $(multiapi) From 07f50f433a9ac859340312abcd8b051346d68f07 Mon Sep 17 00:00:00 2001 From: Chenjie Shi Date: Thu, 21 Apr 2022 13:50:21 +0800 Subject: [PATCH 3/7] remove duplicate x-ms-enum name --- .../stable/2022-05-01/servicelinker.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/stable/2022-05-01/servicelinker.json b/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/stable/2022-05-01/servicelinker.json index f602a015fa85..98c7d9b747e6 100644 --- a/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/stable/2022-05-01/servicelinker.json +++ b/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/stable/2022-05-01/servicelinker.json @@ -398,7 +398,7 @@ "ConfluentSchemaRegistry" ], "x-ms-enum": { - "name": "type", + "name": "TargetServiceType", "modelAsString": true } }, @@ -423,7 +423,7 @@ "KeyVault" ], "x-ms-enum": { - "name": "type", + "name": "AzureResourceType", "modelAsString": true } }, From 07e6e96a3ed7c63c9fc0af8d90c86f99f6cee1ff Mon Sep 17 00:00:00 2001 From: Alancere <804873052@qq.com> Date: Thu, 21 Apr 2022 15:11:05 +0800 Subject: [PATCH 4/7] remove servicelinker --- .../servicelinker/resource-manager/readme.go.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/specification/servicelinker/resource-manager/readme.go.md b/specification/servicelinker/resource-manager/readme.go.md index 8b8c7ffc1707..7cbfa4f449b5 100644 --- a/specification/servicelinker/resource-manager/readme.go.md +++ b/specification/servicelinker/resource-manager/readme.go.md @@ -20,20 +20,9 @@ azure-arm: true ``` yaml $(go) && $(multiapi) batch: - - tag: package-2022-05-01 - tag: package-2021-11-01-preview ``` -### Tag: package-2022-05-01 and go - -These settings apply only when `--tag=package-2022-05-01 --go` is specified on the command line. -Please also specify `--go-sdks-folder=`. - -```yaml $(tag) == 'package-2022-05-01' && $(go) -namespace: servicelinker -output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2022-05-01/$(namespace) -``` - ### Tag: package-2021-11-01-preview and go These settings apply only when `--tag=package-2021-11-01-preview --go` is specified on the command line. From 60aab32067ea95024f15927c1a4a6bcc27a54303 Mon Sep 17 00:00:00 2001 From: Alancere <804873052@qq.com> Date: Thu, 21 Apr 2022 15:13:58 +0800 Subject: [PATCH 5/7] back --- .../stable/2022-05-01/servicelinker.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/stable/2022-05-01/servicelinker.json b/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/stable/2022-05-01/servicelinker.json index 98c7d9b747e6..f602a015fa85 100644 --- a/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/stable/2022-05-01/servicelinker.json +++ b/specification/servicelinker/resource-manager/Microsoft.ServiceLinker/stable/2022-05-01/servicelinker.json @@ -398,7 +398,7 @@ "ConfluentSchemaRegistry" ], "x-ms-enum": { - "name": "TargetServiceType", + "name": "type", "modelAsString": true } }, @@ -423,7 +423,7 @@ "KeyVault" ], "x-ms-enum": { - "name": "AzureResourceType", + "name": "type", "modelAsString": true } }, From 71eebe9de0759037967abccd08d199e68234d03b Mon Sep 17 00:00:00 2001 From: Alancere <804873052@qq.com> Date: Thu, 21 Apr 2022 15:39:44 +0800 Subject: [PATCH 6/7] add direcitve for servicelinker --- .../resource-manager/readme.go.md | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/specification/servicelinker/resource-manager/readme.go.md b/specification/servicelinker/resource-manager/readme.go.md index 7cbfa4f449b5..f2b627db9729 100644 --- a/specification/servicelinker/resource-manager/readme.go.md +++ b/specification/servicelinker/resource-manager/readme.go.md @@ -5,7 +5,7 @@ These settings apply only when `--go` is specified on the command line. ```yaml $(go) && !$(track2) go: license-header: MICROSOFT_APACHE_NO_VERSION - clear-output-folder: true + clear-output-folder: trueA ``` ``` yaml $(go) && $(track2) @@ -20,9 +20,29 @@ azure-arm: true ``` yaml $(go) && $(multiapi) batch: + - tag: package-2022-05-01 - tag: package-2021-11-01-preview ``` +### Tag: package-2022-05-01 and go + +These settings apply only when `--tag=package-2022-05-01 --go` is specified on the command line. +Please also specify `--go-sdks-folder=`. + +```yaml $(tag) == 'package-2022-05-01' && $(go) +namespace: servicelinker +output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2022-05-01/$(namespace) +directive: +- from: swagger-document + where: $.definitions.TargetServiceType + transform: > + $["x-ms-enum"] = TargetServiceType +- from: swagger-document + where: $.definitions.AzureResourceType + transform: > + $["x-ms-enum"] = AzureResourceType +``` + ### Tag: package-2021-11-01-preview and go These settings apply only when `--tag=package-2021-11-01-preview --go` is specified on the command line. From 293b2d4185ff70c3175fd26c803e3d75c6785d2c Mon Sep 17 00:00:00 2001 From: Alancere <804873052@qq.com> Date: Thu, 21 Apr 2022 16:45:34 +0800 Subject: [PATCH 7/7] remove servicelinker batch tag --- .../resource-manager/readme.go.md | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/specification/servicelinker/resource-manager/readme.go.md b/specification/servicelinker/resource-manager/readme.go.md index f2b627db9729..7cbfa4f449b5 100644 --- a/specification/servicelinker/resource-manager/readme.go.md +++ b/specification/servicelinker/resource-manager/readme.go.md @@ -5,7 +5,7 @@ These settings apply only when `--go` is specified on the command line. ```yaml $(go) && !$(track2) go: license-header: MICROSOFT_APACHE_NO_VERSION - clear-output-folder: trueA + clear-output-folder: true ``` ``` yaml $(go) && $(track2) @@ -20,29 +20,9 @@ azure-arm: true ``` yaml $(go) && $(multiapi) batch: - - tag: package-2022-05-01 - tag: package-2021-11-01-preview ``` -### Tag: package-2022-05-01 and go - -These settings apply only when `--tag=package-2022-05-01 --go` is specified on the command line. -Please also specify `--go-sdks-folder=`. - -```yaml $(tag) == 'package-2022-05-01' && $(go) -namespace: servicelinker -output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2022-05-01/$(namespace) -directive: -- from: swagger-document - where: $.definitions.TargetServiceType - transform: > - $["x-ms-enum"] = TargetServiceType -- from: swagger-document - where: $.definitions.AzureResourceType - transform: > - $["x-ms-enum"] = AzureResourceType -``` - ### Tag: package-2021-11-01-preview and go These settings apply only when `--tag=package-2021-11-01-preview --go` is specified on the command line.