From 3671acecb28d6cd9eac6b73620fdda59ce9952ca Mon Sep 17 00:00:00 2001 From: hbc Date: Sat, 31 Oct 2020 11:17:58 +0800 Subject: [PATCH 1/2] aks: update readme tag --- .../readme.azureresourceschema.md | 12 +++++++++ .../resource-manager/readme.go.md | 12 +++++++++ .../resource-manager/readme.java.md | 25 +++++++++++++++---- .../resource-manager/readme.python.md | 12 +++++++++ 4 files changed, 56 insertions(+), 5 deletions(-) diff --git a/specification/containerservice/resource-manager/readme.azureresourceschema.md b/specification/containerservice/resource-manager/readme.azureresourceschema.md index 757d9d5dd16f..9b0062f0ceb4 100644 --- a/specification/containerservice/resource-manager/readme.azureresourceschema.md +++ b/specification/containerservice/resource-manager/readme.azureresourceschema.md @@ -6,6 +6,7 @@ These settings apply only when `--azureresourceschema` is specified on the comma ``` yaml $(azureresourceschema) && $(multiapi) batch: + - tag: schema-containerservice-2020-11-01 - tag: schema-containerservice-2020-09-01 - tag: schema-containerservice-2020-07-01 - tag: schema-containerservice-2020-06-01 @@ -36,6 +37,17 @@ batch: Please also specify `--azureresourceschema-folder=`. +### Tag: schema-containerservice-2020-11-01 and azureresourceschema + +``` yaml $(tag) == 'schema-containerservice-2020-11-01' && $(azureresourceschema) +output-folder: $(azureresourceschema-folder)/schemas + +# all the input files in this apiVersion +input-file: + - Microsoft.ContainerService/stable/2020-11-01/managedClusters.json + +``` + ### Tag: schema-containerservice-2020-09-01 and azureresourceschema ``` yaml $(tag) == 'schema-containerservice-2020-09-01' && $(azureresourceschema) diff --git a/specification/containerservice/resource-manager/readme.go.md b/specification/containerservice/resource-manager/readme.go.md index a237557ee2bd..c9f8af355f3e 100644 --- a/specification/containerservice/resource-manager/readme.go.md +++ b/specification/containerservice/resource-manager/readme.go.md @@ -12,6 +12,7 @@ go: ``` yaml $(go) && $(multiapi) batch: + - tag: package-2020-11 - tag: package-2020-09 - tag: package-2020-07 - tag: package-2020-06 @@ -34,6 +35,17 @@ batch: - tag: package-2017-08 - tag: package-2017-07 ``` + +### Tag: package-2020-11 and go + +These settings apply only when `--package-2020-11 --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +``` yaml $(tag)=='package-2020-11' && $(go) +namespace: containerservice +output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2020-11-01/$(namespace) +``` + ### Tag: package-2020-09 and go These settings apply only when `--package-2020-09 --go` is specified on the command line. diff --git a/specification/containerservice/resource-manager/readme.java.md b/specification/containerservice/resource-manager/readme.java.md index d3c231ff32db..9f5f1553bf85 100644 --- a/specification/containerservice/resource-manager/readme.java.md +++ b/specification/containerservice/resource-manager/readme.java.md @@ -27,20 +27,22 @@ batch: - tag: package-2020-06 - tag: package-2020-07 - tag: package-2020-09 + - tag: package-2020-11 ``` -### Tag: package-2020-07 and java +### Tag: package-2020-11 and java -These settings apply only when `--tag=package-2020-07` is specified on the command line. +These settings apply only when `--tag=package-2020-11` is specified on the command line. Please also specify `--azure-libraries-for-java-folder=`. -``` yaml $(tag) == 'package-2020-07' && $(java) && $(multiapi) +``` yaml $(tag) == 'package-2020-11' && $(java) && $(multiapi) java: - namespace: com.microsoft.azure.management.containerservice.v2020_07_01 - output-folder: $(azure-libraries-for-java-folder)/sdk/containerservice/mgmt-v2020_07_01 + namespace: com.microsoft.azure.management.containerservice.v2020_11_01 + output-folder: $(azure-libraries-for-java-folder)/sdk/containerservice/mgmt-v2020_11_01 regenerate-manager: true generate-interface: true ``` + ### Tag: package-2020-09 and java These settings apply only when `--tag=package-2020-09` is specified on the command line. @@ -54,6 +56,19 @@ regenerate-manager: true generate-interface: true ``` +### Tag: package-2020-07 and java + +These settings apply only when `--tag=package-2020-07` is specified on the command line. +Please also specify `--azure-libraries-for-java-folder=`. + +``` yaml $(tag) == 'package-2020-07' && $(java) && $(multiapi) +java: + namespace: com.microsoft.azure.management.containerservice.v2020_07_01 + output-folder: $(azure-libraries-for-java-folder)/sdk/containerservice/mgmt-v2020_07_01 +regenerate-manager: true +generate-interface: true +``` + ### Tag: package-2020-06 and java These settings apply only when `--tag=package-2020-06` is specified on the command line. diff --git a/specification/containerservice/resource-manager/readme.python.md b/specification/containerservice/resource-manager/readme.python.md index 7a02ff59401b..d7009a2ab853 100644 --- a/specification/containerservice/resource-manager/readme.python.md +++ b/specification/containerservice/resource-manager/readme.python.md @@ -18,6 +18,7 @@ Generate all API versions currently shipped for this package ```yaml $(python) && $(multiapi) batch: + - tag: package-2020-11-01-only - tag: package-2020-09-01-only - tag: package-2020-07-01-only - tag: package-2020-06-01-only @@ -40,6 +41,17 @@ batch: - tag: package-2017-07-only-extended ``` +### Tag: package-2020-11-01-only and python + +These settings apply only when `--tag=package-2020-11-01-only --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2020-11-01-only' && $(python) +python: + namespace: azure.mgmt.containerservice.v2020_11_01 + output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_11_01 +``` + ### Tag: package-2020-09-01-only and python These settings apply only when `--tag=package-2020-09-01-only --python` is specified on the command line. From 213fbe7d8ebd6b25bddead81010d8fe62029582a Mon Sep 17 00:00:00 2001 From: hbc Date: Mon, 2 Nov 2020 12:31:03 +0800 Subject: [PATCH 2/2] aks: add `2020-11-01-only` --- .../containerservice/resource-manager/readme.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/specification/containerservice/resource-manager/readme.md b/specification/containerservice/resource-manager/readme.md index b2cee90a5ef3..02a85c900020 100644 --- a/specification/containerservice/resource-manager/readme.md +++ b/specification/containerservice/resource-manager/readme.md @@ -292,6 +292,19 @@ input-file: ``` +### Tag: package-2020-11-01-only + +These settings apply only when `--tag=package-2020-11-01-only` is specified on the command line. + +``` yaml $(tag) == 'package-2020-11-01-only' +input-file: +- Microsoft.ContainerService/stable/2020-11-01/managedClusters.json +directive: + - suppress: DefinitionsPropertiesNamesCamelCase + where: $.definitions.ManagedClusterProperties.properties.autoScalerProfile + reason: Cluster-autoscaler settings are not camel-cased +``` + ### Tag: package-2020-09-01-only These settings apply only when `--tag=package-2020-09-01-only` is specified on the command line.