From ae93a7abfdf1c15fa357b00a7239b171636bb09d Mon Sep 17 00:00:00 2001 From: arcturusZhang Date: Thu, 24 Sep 2020 11:33:35 +0800 Subject: [PATCH 1/6] some update of the tags for profiles --- specification/compute/resource-manager/readme.go.md | 11 +++++++++++ specification/compute/resource-manager/readme.md | 10 ++++++++++ specification/iothub/resource-manager/readme.go.md | 10 ++++++++++ 3 files changed, 31 insertions(+) diff --git a/specification/compute/resource-manager/readme.go.md b/specification/compute/resource-manager/readme.go.md index 561571b385b6..a0991af175d9 100644 --- a/specification/compute/resource-manager/readme.go.md +++ b/specification/compute/resource-manager/readme.go.md @@ -31,6 +31,7 @@ directive: ```yaml $(go) && $(multiapi) batch: + - tag: package-2020-06-01-hybrid-profile - tag: package-2020-06-01 - tag: package-2019-12-01 - tag: package-2019-07 @@ -50,6 +51,16 @@ batch: - tag: package-container-service-2015-11-preview ``` +### Tag: package-2020-06-01-hybrid-profile and go + +These settings apply only when `--tag=package-2020-06-01-hybrid-profile --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +```yaml $(tag)=='package-2020-06-01-hybrid-profile' && $(go) +namespace: compute +output-folder: $(go-sdk-folder)/profiles/$(namespace)/mgmt/$(namespace) +``` + ### Tag: package-2020-06-01 and go These settings apply only when `--tag=package-2020-06-01 --go` is specified on the command line. diff --git a/specification/compute/resource-manager/readme.md b/specification/compute/resource-manager/readme.md index 052addaaae0f..437c0ac70961 100644 --- a/specification/compute/resource-manager/readme.md +++ b/specification/compute/resource-manager/readme.md @@ -271,6 +271,16 @@ input-file: - Microsoft.ContainerService/stable/2017-01-31/containerService.json ``` +### Tag: package-2020-06-01-hybrid-profile + +These settings apply only when `--tag=package-2020-06-01-hybrid-profile` is specified on the command line. + +``` yaml $(tag) == 'package-2020-06-01-hybrid-profile' +input-file: +- Microsoft.Compute/stable/2020-06-01/compute.json +- Microsoft.Compute/stable/2019-07-01/disk.json +``` + ### Tag: package-2020-06-01-only These settings apply only when `--tag=package-2020-06-01-only` is specified on the command line. diff --git a/specification/iothub/resource-manager/readme.go.md b/specification/iothub/resource-manager/readme.go.md index 78a487967690..0d97d1318696 100644 --- a/specification/iothub/resource-manager/readme.go.md +++ b/specification/iothub/resource-manager/readme.go.md @@ -14,6 +14,7 @@ go: ``` yaml $(go) && $(multiapi) batch: - tag: package-2020-03 + - tag: package-preview-2019-07 - tag: package-preview-2019-03 - tag: package-2018-12-preview - tag: package-2018-04 @@ -32,6 +33,15 @@ Please also specify `--go-sdk-folder=`. + +``` yaml $(tag) == 'package-preview-2019-07' && $(go) +output-folder: $(go-sdk-folder)/services/preview/iothub/mgmt/2019-07-01-preview/$(namespace) +``` + ### Tag:package-preview-2019-03 and go These settings apply only when `--tag=package-preview-2019-03 --go` is specified on the command line. From 0641a025aac7dd5daf1c8f03e0bc426d2387a2e3 Mon Sep 17 00:00:00 2001 From: arcturusZhang Date: Thu, 24 Sep 2020 12:19:52 +0800 Subject: [PATCH 2/6] final update for profiles --- specification/keyvault/resource-manager/readme.md | 1 + specification/web/resource-manager/readme.go.md | 10 ++++++++++ specification/web/resource-manager/readme.md | 15 +++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/specification/keyvault/resource-manager/readme.md b/specification/keyvault/resource-manager/readme.md index ae51d5470d93..1922a3920b49 100644 --- a/specification/keyvault/resource-manager/readme.md +++ b/specification/keyvault/resource-manager/readme.md @@ -61,6 +61,7 @@ These settings apply only when `--tag=package-2019-09` is specified on the comma input-file: - Microsoft.KeyVault/stable/2019-09-01/keyvault.json - Microsoft.KeyVault/stable/2019-09-01/providers.json +- Microsoft.KeyVault/stable/2019-09-01/secrets.json ``` ### Tag: package-2018-02-14-preview diff --git a/specification/web/resource-manager/readme.go.md b/specification/web/resource-manager/readme.go.md index f6e517e79cd8..07008cf235b8 100644 --- a/specification/web/resource-manager/readme.go.md +++ b/specification/web/resource-manager/readme.go.md @@ -13,6 +13,7 @@ go: ``` yaml $(go) && $(multiapi) batch: + - tag: package-2020-09-01-hybrid-profile - tag: package-2020-06 - tag: package-2019-08 - tag: package-2018-02 @@ -20,6 +21,15 @@ batch: - tag: package-2015-08-preview ``` +### Tag: package-2020-09-01-hybrid-profile and go + +These settings apply only when `--tag=package-2020-09-01-hybrid-profile --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +``` yaml $(tag) == 'package-2020-09-01-hybrid-profile' && $(go) +output-folder: $(go-sdk-folder)/profiles/$(namespace)/mgmt/$(namespace) +``` + ### Tag: package-2020-06 and go These settings apply only when `--tag=package-2020-06 --go` is specified on the command line. diff --git a/specification/web/resource-manager/readme.md b/specification/web/resource-manager/readme.md index 066d4cda40a8..b53da8109e80 100644 --- a/specification/web/resource-manager/readme.md +++ b/specification/web/resource-manager/readme.md @@ -1054,6 +1054,21 @@ input-file: - Microsoft.Web/stable/2016-03-01/ResourceProvider.json ``` +### Tag: package-2020-09-01-hybrid-profile + +These settings apply only when `--tag=package-2020-09-01-hybrid-profile` is specified on the command line. + +``` yaml $(tag) == 'package-2020-09-01-hybrid-profile' +input-file: +- Microsoft.Web/stable/2018-02-01/Certificates.json +- Microsoft.Web/stable/2018-02-01/WebApps.json +- Microsoft.Web/stable/2018-02-01/ResourceProvider.json +- Microsoft.Web/stable/2016-09-01/AppServicePlans.json +- Microsoft.Web/stable/2016-03-01/Provider.json +- Microsoft.Web/stable/2016-03-01/ResourceProvider.json +- Microsoft.Web/stable/2016-03-01/Recommendations.json +``` + --- # Code Generation From 070a915cf3f235b6f3dbce16f91a6d4b4e23f229 Mon Sep 17 00:00:00 2001 From: arcturusZhang Date: Thu, 24 Sep 2020 12:21:48 +0800 Subject: [PATCH 3/6] a fix of tag name --- specification/compute/resource-manager/readme.go.md | 8 ++++---- specification/compute/resource-manager/readme.md | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/specification/compute/resource-manager/readme.go.md b/specification/compute/resource-manager/readme.go.md index a0991af175d9..5c133bf42537 100644 --- a/specification/compute/resource-manager/readme.go.md +++ b/specification/compute/resource-manager/readme.go.md @@ -31,7 +31,7 @@ directive: ```yaml $(go) && $(multiapi) batch: - - tag: package-2020-06-01-hybrid-profile + - tag: package-2020-09-01-hybrid-profile - tag: package-2020-06-01 - tag: package-2019-12-01 - tag: package-2019-07 @@ -51,12 +51,12 @@ batch: - tag: package-container-service-2015-11-preview ``` -### Tag: package-2020-06-01-hybrid-profile and go +### Tag: package-2020-09-01-hybrid-profile and go -These settings apply only when `--tag=package-2020-06-01-hybrid-profile --go` is specified on the command line. +These settings apply only when `--tag=package-2020-09-01-hybrid-profile --go` is specified on the command line. Please also specify `--go-sdk-folder=`. -```yaml $(tag)=='package-2020-06-01-hybrid-profile' && $(go) +```yaml $(tag)=='package-2020-09-01-hybrid-profile' && $(go) namespace: compute output-folder: $(go-sdk-folder)/profiles/$(namespace)/mgmt/$(namespace) ``` diff --git a/specification/compute/resource-manager/readme.md b/specification/compute/resource-manager/readme.md index 437c0ac70961..27511452f528 100644 --- a/specification/compute/resource-manager/readme.md +++ b/specification/compute/resource-manager/readme.md @@ -271,11 +271,11 @@ input-file: - Microsoft.ContainerService/stable/2017-01-31/containerService.json ``` -### Tag: package-2020-06-01-hybrid-profile +### Tag: package-2020-09-01-hybrid-profile -These settings apply only when `--tag=package-2020-06-01-hybrid-profile` is specified on the command line. +These settings apply only when `--tag=package-2020-09-01-hybrid-profile` is specified on the command line. -``` yaml $(tag) == 'package-2020-06-01-hybrid-profile' +``` yaml $(tag) == 'package-2020-09-01-hybrid-profile' input-file: - Microsoft.Compute/stable/2020-06-01/compute.json - Microsoft.Compute/stable/2019-07-01/disk.json From b067ca7b103a2039ed73cd739bd695f648ad3dc4 Mon Sep 17 00:00:00 2001 From: arcturusZhang Date: Thu, 24 Sep 2020 13:31:02 +0800 Subject: [PATCH 4/6] Remove the changes for web readme since it does not work --- specification/web/resource-manager/readme.go.md | 10 ---------- specification/web/resource-manager/readme.md | 15 --------------- 2 files changed, 25 deletions(-) diff --git a/specification/web/resource-manager/readme.go.md b/specification/web/resource-manager/readme.go.md index 07008cf235b8..f6e517e79cd8 100644 --- a/specification/web/resource-manager/readme.go.md +++ b/specification/web/resource-manager/readme.go.md @@ -13,7 +13,6 @@ go: ``` yaml $(go) && $(multiapi) batch: - - tag: package-2020-09-01-hybrid-profile - tag: package-2020-06 - tag: package-2019-08 - tag: package-2018-02 @@ -21,15 +20,6 @@ batch: - tag: package-2015-08-preview ``` -### Tag: package-2020-09-01-hybrid-profile and go - -These settings apply only when `--tag=package-2020-09-01-hybrid-profile --go` is specified on the command line. -Please also specify `--go-sdk-folder=`. - -``` yaml $(tag) == 'package-2020-09-01-hybrid-profile' && $(go) -output-folder: $(go-sdk-folder)/profiles/$(namespace)/mgmt/$(namespace) -``` - ### Tag: package-2020-06 and go These settings apply only when `--tag=package-2020-06 --go` is specified on the command line. diff --git a/specification/web/resource-manager/readme.md b/specification/web/resource-manager/readme.md index b53da8109e80..066d4cda40a8 100644 --- a/specification/web/resource-manager/readme.md +++ b/specification/web/resource-manager/readme.md @@ -1054,21 +1054,6 @@ input-file: - Microsoft.Web/stable/2016-03-01/ResourceProvider.json ``` -### Tag: package-2020-09-01-hybrid-profile - -These settings apply only when `--tag=package-2020-09-01-hybrid-profile` is specified on the command line. - -``` yaml $(tag) == 'package-2020-09-01-hybrid-profile' -input-file: -- Microsoft.Web/stable/2018-02-01/Certificates.json -- Microsoft.Web/stable/2018-02-01/WebApps.json -- Microsoft.Web/stable/2018-02-01/ResourceProvider.json -- Microsoft.Web/stable/2016-09-01/AppServicePlans.json -- Microsoft.Web/stable/2016-03-01/Provider.json -- Microsoft.Web/stable/2016-03-01/ResourceProvider.json -- Microsoft.Web/stable/2016-03-01/Recommendations.json -``` - --- # Code Generation From 9260b07dca5b7b7e0af8f6525b542e9d9dbffe91 Mon Sep 17 00:00:00 2001 From: Dapeng Zhang Date: Wed, 14 Oct 2020 09:23:30 +0800 Subject: [PATCH 5/6] Rename tag for compute, revert keyvault tag change --- .../compute/resource-manager/readme.go.md | 8 ++++---- .../compute/resource-manager/readme.md | 20 +++++++++---------- .../keyvault/resource-manager/readme.md | 1 - 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/specification/compute/resource-manager/readme.go.md b/specification/compute/resource-manager/readme.go.md index 5c133bf42537..48a7adcc4f03 100644 --- a/specification/compute/resource-manager/readme.go.md +++ b/specification/compute/resource-manager/readme.go.md @@ -31,7 +31,7 @@ directive: ```yaml $(go) && $(multiapi) batch: - - tag: package-2020-09-01-hybrid-profile + - tag: profile-hybrid-2020-09-01 - tag: package-2020-06-01 - tag: package-2019-12-01 - tag: package-2019-07 @@ -51,12 +51,12 @@ batch: - tag: package-container-service-2015-11-preview ``` -### Tag: package-2020-09-01-hybrid-profile and go +### Tag: profile-hybrid-2020-09-01 and go -These settings apply only when `--tag=package-2020-09-01-hybrid-profile --go` is specified on the command line. +These settings apply only when `--tag=profile-hybrid-2020-09-01 --go` is specified on the command line. Please also specify `--go-sdk-folder=`. -```yaml $(tag)=='package-2020-09-01-hybrid-profile' && $(go) +```yaml $(tag)=='profile-hybrid-2020-09-01' && $(go) namespace: compute output-folder: $(go-sdk-folder)/profiles/$(namespace)/mgmt/$(namespace) ``` diff --git a/specification/compute/resource-manager/readme.md b/specification/compute/resource-manager/readme.md index 27511452f528..4bf786675569 100644 --- a/specification/compute/resource-manager/readme.md +++ b/specification/compute/resource-manager/readme.md @@ -271,16 +271,6 @@ input-file: - Microsoft.ContainerService/stable/2017-01-31/containerService.json ``` -### Tag: package-2020-09-01-hybrid-profile - -These settings apply only when `--tag=package-2020-09-01-hybrid-profile` is specified on the command line. - -``` yaml $(tag) == 'package-2020-09-01-hybrid-profile' -input-file: -- Microsoft.Compute/stable/2020-06-01/compute.json -- Microsoft.Compute/stable/2019-07-01/disk.json -``` - ### Tag: package-2020-06-01-only These settings apply only when `--tag=package-2020-06-01-only` is specified on the command line. @@ -879,6 +869,16 @@ input-file: - Microsoft.Compute/stable/2017-03-30/disk.json ``` +### Tag: profile-hybrid-2020-09-01 + +These settings apply only when `--tag=profile-hybrid-2020-09-01` is specified on the command line. + +``` yaml $(tag) == 'profile-hybrid-2020-09-01' +input-file: +- Microsoft.Compute/stable/2020-06-01/compute.json +- Microsoft.Compute/stable/2019-07-01/disk.json +``` + ## AzureResourceSchema See configuration in [readme.azureresourceschema.md](./readme.azureresourceschema.md) diff --git a/specification/keyvault/resource-manager/readme.md b/specification/keyvault/resource-manager/readme.md index 1922a3920b49..ae51d5470d93 100644 --- a/specification/keyvault/resource-manager/readme.md +++ b/specification/keyvault/resource-manager/readme.md @@ -61,7 +61,6 @@ These settings apply only when `--tag=package-2019-09` is specified on the comma input-file: - Microsoft.KeyVault/stable/2019-09-01/keyvault.json - Microsoft.KeyVault/stable/2019-09-01/providers.json -- Microsoft.KeyVault/stable/2019-09-01/secrets.json ``` ### Tag: package-2018-02-14-preview From 76eb082e8ea67920eeeb9109b800807e806944ed Mon Sep 17 00:00:00 2001 From: Dapeng Zhang Date: Tue, 1 Dec 2020 11:18:33 +0800 Subject: [PATCH 6/6] update --- specification/compute/resource-manager/readme.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/specification/compute/resource-manager/readme.md b/specification/compute/resource-manager/readme.md index f9a47497febf..d8694fa5f521 100644 --- a/specification/compute/resource-manager/readme.md +++ b/specification/compute/resource-manager/readme.md @@ -808,16 +808,6 @@ input-file: - Microsoft.Compute/stable/2019-07-01/disk.json ``` -### Tag: profile-hybrid-2020-09-01 - -These settings apply only when `--tag=profile-hybrid-2020-09-01` is specified on the command line. - -``` yaml $(tag) == 'profile-hybrid-2020-09-01' -input-file: -- Microsoft.Compute/stable/2020-06-01/compute.json -- Microsoft.Compute/stable/2019-07-01/disk.json -``` - ## AzureResourceSchema See configuration in [readme.azureresourceschema.md](./readme.azureresourceschema.md) \ No newline at end of file