From fd208b0fdc253e0c861dccdb77faad7e80475bb8 Mon Sep 17 00:00:00 2001 From: 804873052 <804873052@qq.com> Date: Wed, 15 Dec 2021 10:25:32 +0800 Subject: [PATCH 1/6] [Go]Track2 modify readme.go.md 11 --- specification/addons/resource-manager/readme.go.md | 11 +++++++++++ specification/addons/resource-manager/readme.md | 3 ++- .../customproviders/resource-manager/readme.go.md | 10 +++++++++- .../customproviders/resource-manager/readme.md | 1 + specification/datadog/resource-manager/readme.go.md | 10 +++++++++- specification/datadog/resource-manager/readme.md | 1 + specification/logz/resource-manager/readme.go.md | 10 +++++++++- specification/logz/resource-manager/readme.md | 1 + .../Microsoft.SaaS/preview/2018-03-01-beta/saas.json | 2 +- specification/saas/resource-manager/readme.go.md | 10 +++++++++- specification/saas/resource-manager/readme.md | 1 + 11 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 specification/addons/resource-manager/readme.go.md diff --git a/specification/addons/resource-manager/readme.go.md b/specification/addons/resource-manager/readme.go.md new file mode 100644 index 000000000000..e7e53c696430 --- /dev/null +++ b/specification/addons/resource-manager/readme.go.md @@ -0,0 +1,11 @@ +## Go + +These settings apply only when `--go` is specified on the command line. + +``` yaml $(go) && $(track2) +license-header: MICROSOFT_MIT_NO_VERSION +module-name: sdk/resourcemanager/addons/armaddons +module: github.com/Azure/azure-sdk-for-go/$(module-name) +output-folder: $(go-sdk-folder)/$(module-name) +azure-arm: true +``` diff --git a/specification/addons/resource-manager/readme.md b/specification/addons/resource-manager/readme.md index 2f93f9bd1cdb..5523c2d924b2 100644 --- a/specification/addons/resource-manager/readme.md +++ b/specification/addons/resource-manager/readme.md @@ -58,6 +58,7 @@ This is not used by Autorest itself. ``` yaml $(swagger-to-sdk) swagger-to-sdk: - repo: azure-resource-manager-schemas + - repo: azure-sdk-for-go-track2 ``` --- @@ -107,7 +108,7 @@ python: These settings apply only when `--go` is specified on the command line. -``` yaml $(go) +``` yaml $(go) && !$(track2) go: license-header: MICROSOFT_APACHE_NO_VERSION clear-output-folder: true diff --git a/specification/customproviders/resource-manager/readme.go.md b/specification/customproviders/resource-manager/readme.go.md index aa40107a9abc..fd8ddcc939f2 100644 --- a/specification/customproviders/resource-manager/readme.go.md +++ b/specification/customproviders/resource-manager/readme.go.md @@ -2,13 +2,21 @@ These settings apply only when `--go` is specified on the command line. -```yaml $(go) +```yaml $(go) && !$(track2) go: license-header: MICROSOFT_MIT_NO_VERSION namespace: customproviders clear-output-folder: true ``` +``` yaml $(go) && $(track2) +license-header: MICROSOFT_MIT_NO_VERSION +module-name: sdk/resourcemanager/customproviders/armcustomproviders +module: github.com/Azure/azure-sdk-for-go/$(module-name) +output-folder: $(go-sdk-folder)/$(module-name) +azure-arm: true +``` + ### Tag: package-2018-09-01-preview and go These settings apply only when `--tag=package-2018-09-01-preview --go` is specified on the command line. diff --git a/specification/customproviders/resource-manager/readme.md b/specification/customproviders/resource-manager/readme.md index d79a7ead5125..11523e9c00dc 100644 --- a/specification/customproviders/resource-manager/readme.md +++ b/specification/customproviders/resource-manager/readme.md @@ -54,6 +54,7 @@ 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-trenton - repo: azure-sdk-for-node - repo: azure-sdk-for-js diff --git a/specification/datadog/resource-manager/readme.go.md b/specification/datadog/resource-manager/readme.go.md index 508681d79a54..f28d6982d4c4 100644 --- a/specification/datadog/resource-manager/readme.go.md +++ b/specification/datadog/resource-manager/readme.go.md @@ -2,13 +2,21 @@ These settings apply only when `--go` is specified on the command line. -``` yaml $(go) +``` yaml $(go) && !$(track2) go: license-header: MICROSOFT_MIT_NO_VERSION namespace: datadog clear-output-folder: true ``` +``` yaml $(go) && $(track2) +license-header: MICROSOFT_MIT_NO_VERSION +module-name: sdk/resourcemanager/datadog/armdatadog +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) diff --git a/specification/datadog/resource-manager/readme.md b/specification/datadog/resource-manager/readme.md index a5717a6d4a1c..0270abaf016b 100644 --- a/specification/datadog/resource-manager/readme.md +++ b/specification/datadog/resource-manager/readme.md @@ -60,6 +60,7 @@ 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-sdk-for-node - repo: azure-sdk-for-ruby diff --git a/specification/logz/resource-manager/readme.go.md b/specification/logz/resource-manager/readme.go.md index 847a9089af1c..2eb7d3c9899e 100644 --- a/specification/logz/resource-manager/readme.go.md +++ b/specification/logz/resource-manager/readme.go.md @@ -2,13 +2,21 @@ These settings apply only when `--go` is specified on the command line. -```yaml $(go) +```yaml $(go) && !$(track2) go: license-header: MICROSOFT_MIT_NO_VERSION namespace: logz clear-output-folder: true ``` +``` yaml $(go) && $(track2) +license-header: MICROSOFT_MIT_NO_VERSION +module-name: sdk/resourcemanager/logz/armlogz +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) diff --git a/specification/logz/resource-manager/readme.md b/specification/logz/resource-manager/readme.md index a6f3f18b5fcb..136bbb34190d 100644 --- a/specification/logz/resource-manager/readme.md +++ b/specification/logz/resource-manager/readme.md @@ -64,6 +64,7 @@ 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 diff --git a/specification/saas/resource-manager/Microsoft.SaaS/preview/2018-03-01-beta/saas.json b/specification/saas/resource-manager/Microsoft.SaaS/preview/2018-03-01-beta/saas.json index ef85ee0eeb3b..171f16a7f8bd 100644 --- a/specification/saas/resource-manager/Microsoft.SaaS/preview/2018-03-01-beta/saas.json +++ b/specification/saas/resource-manager/Microsoft.SaaS/preview/2018-03-01-beta/saas.json @@ -364,7 +364,7 @@ "tags": [ "SaaSResources" ], - "operationId": "SaasResource-listAccessToken", + "operationId": "SaasResource_listAccessToken", "description": "Gets the ISV access token for a SaaS resource.", "parameters": [ { diff --git a/specification/saas/resource-manager/readme.go.md b/specification/saas/resource-manager/readme.go.md index 3b7c23350efa..97017d39d36f 100644 --- a/specification/saas/resource-manager/readme.go.md +++ b/specification/saas/resource-manager/readme.go.md @@ -2,12 +2,20 @@ These settings apply only when `--go` is specified on the command line. -```yaml $(go) +```yaml $(go) && !$(track2) go: license-header: MICROSOFT_MIT_NO_VERSION clear-output-folder: true ``` +``` yaml $(go) && $(track2) +license-header: MICROSOFT_MIT_NO_VERSION +module-name: sdk/resourcemanager/saas/armsaas +module: github.com/Azure/azure-sdk-for-go/$(module-name) +output-folder: $(go-sdk-folder)/$(module-name) +azure-arm: true +``` + ### Tag: package-2018-03-01-beta and go These settings apply only when `--tag=package-2018-03-01-beta --go` is specified on the command line. diff --git a/specification/saas/resource-manager/readme.md b/specification/saas/resource-manager/readme.md index 71dab2d2bd87..7341f6c3a765 100644 --- a/specification/saas/resource-manager/readme.md +++ b/specification/saas/resource-manager/readme.md @@ -52,6 +52,7 @@ swagger-to-sdk: - repo: azure-sdk-for-python - repo: azure-sdk-for-java - repo: azure-sdk-for-go + - repo: azure-sdk-for-go-track2 - repo: azure-sdk-for-js - repo: azure-sdk-for-ruby after_scripts: From e8b2bb8467eb697dd1e4a757647692ab7ca50fed Mon Sep 17 00:00:00 2001 From: 804873052 <804873052@qq.com> Date: Wed, 15 Dec 2021 13:47:47 +0800 Subject: [PATCH 2/6] add go multiapi --- .../customproviders/resource-manager/readme.go.md | 7 +++++++ specification/saas/resource-manager/readme.go.md | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/specification/customproviders/resource-manager/readme.go.md b/specification/customproviders/resource-manager/readme.go.md index fd8ddcc939f2..d47c616311b5 100644 --- a/specification/customproviders/resource-manager/readme.go.md +++ b/specification/customproviders/resource-manager/readme.go.md @@ -17,6 +17,13 @@ output-folder: $(go-sdk-folder)/$(module-name) azure-arm: true ``` +### Go multi-api + +``` yaml $(go) && $(multiapi) +batch: + - tag: package-2018-09-01-preview +``` + ### Tag: package-2018-09-01-preview and go These settings apply only when `--tag=package-2018-09-01-preview --go` is specified on the command line. diff --git a/specification/saas/resource-manager/readme.go.md b/specification/saas/resource-manager/readme.go.md index 97017d39d36f..36e5de96e819 100644 --- a/specification/saas/resource-manager/readme.go.md +++ b/specification/saas/resource-manager/readme.go.md @@ -16,6 +16,13 @@ output-folder: $(go-sdk-folder)/$(module-name) azure-arm: true ``` +### Go multi-api + +``` yaml $(go) && $(multiapi) +batch: + - tag: package-2018-03-01-beta +``` + ### Tag: package-2018-03-01-beta and go These settings apply only when `--tag=package-2018-03-01-beta --go` is specified on the command line. From e3eaa0c2d5193213c7b9ae8c101ce7b2435f098d Mon Sep 17 00:00:00 2001 From: 804873052 <804873052@qq.com> Date: Wed, 15 Dec 2021 14:10:03 +0800 Subject: [PATCH 3/6] remove addons --- specification/addons/resource-manager/readme.go.md | 11 ----------- specification/addons/resource-manager/readme.md | 1 - 2 files changed, 12 deletions(-) delete mode 100644 specification/addons/resource-manager/readme.go.md diff --git a/specification/addons/resource-manager/readme.go.md b/specification/addons/resource-manager/readme.go.md deleted file mode 100644 index e7e53c696430..000000000000 --- a/specification/addons/resource-manager/readme.go.md +++ /dev/null @@ -1,11 +0,0 @@ -## Go - -These settings apply only when `--go` is specified on the command line. - -``` yaml $(go) && $(track2) -license-header: MICROSOFT_MIT_NO_VERSION -module-name: sdk/resourcemanager/addons/armaddons -module: github.com/Azure/azure-sdk-for-go/$(module-name) -output-folder: $(go-sdk-folder)/$(module-name) -azure-arm: true -``` diff --git a/specification/addons/resource-manager/readme.md b/specification/addons/resource-manager/readme.md index 5523c2d924b2..a42f6d384e60 100644 --- a/specification/addons/resource-manager/readme.md +++ b/specification/addons/resource-manager/readme.md @@ -58,7 +58,6 @@ This is not used by Autorest itself. ``` yaml $(swagger-to-sdk) swagger-to-sdk: - repo: azure-resource-manager-schemas - - repo: azure-sdk-for-go-track2 ``` --- From 35898f6f40fb68793004d870dce54d4187785771 Mon Sep 17 00:00:00 2001 From: 804873052 <804873052@qq.com> Date: Wed, 15 Dec 2021 14:27:40 +0800 Subject: [PATCH 4/6] add directive --- .../Microsoft.SaaS/preview/2018-03-01-beta/saas.json | 2 +- specification/saas/resource-manager/readme.go.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/specification/saas/resource-manager/Microsoft.SaaS/preview/2018-03-01-beta/saas.json b/specification/saas/resource-manager/Microsoft.SaaS/preview/2018-03-01-beta/saas.json index 171f16a7f8bd..ef85ee0eeb3b 100644 --- a/specification/saas/resource-manager/Microsoft.SaaS/preview/2018-03-01-beta/saas.json +++ b/specification/saas/resource-manager/Microsoft.SaaS/preview/2018-03-01-beta/saas.json @@ -364,7 +364,7 @@ "tags": [ "SaaSResources" ], - "operationId": "SaasResource_listAccessToken", + "operationId": "SaasResource-listAccessToken", "description": "Gets the ISV access token for a SaaS resource.", "parameters": [ { diff --git a/specification/saas/resource-manager/readme.go.md b/specification/saas/resource-manager/readme.go.md index 36e5de96e819..be7b67489f77 100644 --- a/specification/saas/resource-manager/readme.go.md +++ b/specification/saas/resource-manager/readme.go.md @@ -14,6 +14,11 @@ module-name: sdk/resourcemanager/saas/armsaas module: github.com/Azure/azure-sdk-for-go/$(module-name) output-folder: $(go-sdk-folder)/$(module-name) azure-arm: true +directive: + from: saas.json + where: $.paths["/providers/Microsoft.SaaS/saasresources/{resourceId}/listAccessToken"].post + transform: > + $["operationId"] = "SaasResources_listAccessToken" ``` ### Go multi-api From f0c1930bf259016df91560f941a1094b6b7b74ff Mon Sep 17 00:00:00 2001 From: 804873052 <804873052@qq.com> Date: Wed, 15 Dec 2021 14:36:42 +0800 Subject: [PATCH 5/6] fix --- specification/addons/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/addons/resource-manager/readme.md b/specification/addons/resource-manager/readme.md index a42f6d384e60..2f93f9bd1cdb 100644 --- a/specification/addons/resource-manager/readme.md +++ b/specification/addons/resource-manager/readme.md @@ -107,7 +107,7 @@ python: These settings apply only when `--go` is specified on the command line. -``` yaml $(go) && !$(track2) +``` yaml $(go) go: license-header: MICROSOFT_APACHE_NO_VERSION clear-output-folder: true From 5b7ed9a4dff6b2321990611bb7451a3ea83117b0 Mon Sep 17 00:00:00 2001 From: 804873052 <804873052@qq.com> Date: Thu, 16 Dec 2021 15:11:30 +0800 Subject: [PATCH 6/6] beta to preview output-folder --- specification/saas/resource-manager/readme.go.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/saas/resource-manager/readme.go.md b/specification/saas/resource-manager/readme.go.md index be7b67489f77..f9cc29e9ca58 100644 --- a/specification/saas/resource-manager/readme.go.md +++ b/specification/saas/resource-manager/readme.go.md @@ -35,5 +35,5 @@ Please also specify `--go-sdks-folder=