From 97c37e01abfaf2c2c421515270343824be8b3a03 Mon Sep 17 00:00:00 2001 From: Zed <601306339@qq.com> Date: Fri, 9 Apr 2021 16:30:35 +0800 Subject: [PATCH 1/5] keyvault t2 config --- specification/keyvault/resource-manager/readme.md | 4 ++++ specification/keyvault/resource-manager/readme.python.md | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/specification/keyvault/resource-manager/readme.md b/specification/keyvault/resource-manager/readme.md index b1926fc2442c..c3dd92daf881 100644 --- a/specification/keyvault/resource-manager/readme.md +++ b/specification/keyvault/resource-manager/readme.md @@ -169,6 +169,10 @@ swagger-to-sdk: See configuration in [readme.go.md](./readme.go.md) +## Python + +See configuration in [readme.python.md](./readme.python.md) + ## Java See configuration in [readme.java.md](./readme.java.md) diff --git a/specification/keyvault/resource-manager/readme.python.md b/specification/keyvault/resource-manager/readme.python.md index c0ce182af5ae..649cf8e9094d 100644 --- a/specification/keyvault/resource-manager/readme.python.md +++ b/specification/keyvault/resource-manager/readme.python.md @@ -4,10 +4,13 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. Use `--python-mode=update` if you already have a setup.py and just want to update the code itself. -``` yaml +``` yaml $(python) && $(track2) +python-mode: create azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION +namespace: azure.mgmt.keyvault package-name: azure-mgmt-keyvault +package-version: 1.0.0b1 no-namespace-folders: true ``` From 3993c9b7d32fc4e866a4bcadbccd5d2027a9a1f0 Mon Sep 17 00:00:00 2001 From: Zed <601306339@qq.com> Date: Fri, 9 Apr 2021 17:48:16 +0800 Subject: [PATCH 2/5] keyvault multi-api config --- specification/keyvault/resource-manager/readme.md | 11 +++++++++++ .../keyvault/resource-manager/readme.python.md | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/specification/keyvault/resource-manager/readme.md b/specification/keyvault/resource-manager/readme.md index c3dd92daf881..84ab41501874 100644 --- a/specification/keyvault/resource-manager/readme.md +++ b/specification/keyvault/resource-manager/readme.md @@ -42,6 +42,17 @@ input-file: - Microsoft.KeyVault/preview/2021-04-01-preview/providers.json - Microsoft.KeyVault/preview/2021-04-01-preview/secrets.json ``` +### Tag: package-preview-2020-04-only + +These settings apply only when `--tag=package-preview-2020-04-only` is specified on the command line. +This tag is for the development of preview features related to managed HSM of Azure CLI and PowerShell. + +``` yaml $(tag) == 'package-preview-2020-04-only' +input-file: + - Microsoft.KeyVault/preview/2020-04-01-preview/managedHsm.json +``` + + ### Tag: package-preview-2020-04 These settings apply only when `--tag=package-preview-2020-04` is specified on the command line. diff --git a/specification/keyvault/resource-manager/readme.python.md b/specification/keyvault/resource-manager/readme.python.md index 649cf8e9094d..58792dd0bbac 100644 --- a/specification/keyvault/resource-manager/readme.python.md +++ b/specification/keyvault/resource-manager/readme.python.md @@ -24,7 +24,7 @@ batch: - tag: package-2019-09 - tag: package-2018-02 - tag: package-2016-10 - - tag: package-preview-2020-04 + - tag: package-preview-2020-04-only - tag: package-preview-2021-04 - multiapiscript: true ``` @@ -43,11 +43,11 @@ namespace: azure.mgmt.keyvault.v2021_04_01_preview output-folder: $(python-sdks-folder)/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2021_04_01_preview ``` -### Tag: package-preview-2020-04 and python +### Tag: package-preview-2020-04-only and python -These settings apply only when `--tag=package-preview-2020-04 --python` is specified on the command line. +These settings apply only when `--tag=package-preview-2020-04-only --python` is specified on the command line. -``` yaml $(tag) == 'package-preview-2020-04' +``` yaml $(tag) == 'package-preview-2020-04-only' namespace: azure.mgmt.keyvault.v2020_04_01_preview output-folder: $(python-sdks-folder)/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2020_04_01_preview ``` From 274ecabc346dc75ae22c62fba8a95471f812b626 Mon Sep 17 00:00:00 2001 From: Zed <601306339@qq.com> Date: Mon, 12 Apr 2021 13:16:21 +0800 Subject: [PATCH 3/5] multi api config --- specification/keyvault/resource-manager/readme.md | 10 ---------- .../keyvault/resource-manager/readme.python.md | 8 ++++---- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/specification/keyvault/resource-manager/readme.md b/specification/keyvault/resource-manager/readme.md index 84ab41501874..0a7c68f389c4 100644 --- a/specification/keyvault/resource-manager/readme.md +++ b/specification/keyvault/resource-manager/readme.md @@ -42,16 +42,6 @@ input-file: - Microsoft.KeyVault/preview/2021-04-01-preview/providers.json - Microsoft.KeyVault/preview/2021-04-01-preview/secrets.json ``` -### Tag: package-preview-2020-04-only - -These settings apply only when `--tag=package-preview-2020-04-only` is specified on the command line. -This tag is for the development of preview features related to managed HSM of Azure CLI and PowerShell. - -``` yaml $(tag) == 'package-preview-2020-04-only' -input-file: - - Microsoft.KeyVault/preview/2020-04-01-preview/managedHsm.json -``` - ### Tag: package-preview-2020-04 diff --git a/specification/keyvault/resource-manager/readme.python.md b/specification/keyvault/resource-manager/readme.python.md index 58792dd0bbac..a2a5ddb5284d 100644 --- a/specification/keyvault/resource-manager/readme.python.md +++ b/specification/keyvault/resource-manager/readme.python.md @@ -24,7 +24,7 @@ batch: - tag: package-2019-09 - tag: package-2018-02 - tag: package-2016-10 - - tag: package-preview-2020-04-only + - tag: package-preview-2020-04-full - tag: package-preview-2021-04 - multiapiscript: true ``` @@ -43,11 +43,11 @@ namespace: azure.mgmt.keyvault.v2021_04_01_preview output-folder: $(python-sdks-folder)/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2021_04_01_preview ``` -### Tag: package-preview-2020-04-only and python +### Tag: package-preview-2020-04-full and python -These settings apply only when `--tag=package-preview-2020-04-only --python` is specified on the command line. +These settings apply only when `--tag=package-preview-2020-04-full --python` is specified on the command line. -``` yaml $(tag) == 'package-preview-2020-04-only' +``` yaml $(tag) == 'package-preview-2020-04-full' namespace: azure.mgmt.keyvault.v2020_04_01_preview output-folder: $(python-sdks-folder)/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2020_04_01_preview ``` From 8ac1b5f469dda10ed9f4da06edf721413055e1c2 Mon Sep 17 00:00:00 2001 From: Zed <601306339@qq.com> Date: Mon, 12 Apr 2021 13:39:15 +0800 Subject: [PATCH 4/5] config reset --- specification/keyvault/resource-manager/readme.md | 1 - .../keyvault/resource-manager/readme.python.md | 13 +++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/specification/keyvault/resource-manager/readme.md b/specification/keyvault/resource-manager/readme.md index 0a7c68f389c4..c3dd92daf881 100644 --- a/specification/keyvault/resource-manager/readme.md +++ b/specification/keyvault/resource-manager/readme.md @@ -42,7 +42,6 @@ input-file: - Microsoft.KeyVault/preview/2021-04-01-preview/providers.json - Microsoft.KeyVault/preview/2021-04-01-preview/secrets.json ``` - ### Tag: package-preview-2020-04 These settings apply only when `--tag=package-preview-2020-04` is specified on the command line. diff --git a/specification/keyvault/resource-manager/readme.python.md b/specification/keyvault/resource-manager/readme.python.md index a2a5ddb5284d..9ddaa9d75dbd 100644 --- a/specification/keyvault/resource-manager/readme.python.md +++ b/specification/keyvault/resource-manager/readme.python.md @@ -4,13 +4,10 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. Use `--python-mode=update` if you already have a setup.py and just want to update the code itself. -``` yaml $(python) && $(track2) -python-mode: create +``` yaml $(python) azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION -namespace: azure.mgmt.keyvault package-name: azure-mgmt-keyvault -package-version: 1.0.0b1 no-namespace-folders: true ``` @@ -24,7 +21,7 @@ batch: - tag: package-2019-09 - tag: package-2018-02 - tag: package-2016-10 - - tag: package-preview-2020-04-full + - tag: package-preview-2020-04 - tag: package-preview-2021-04 - multiapiscript: true ``` @@ -43,11 +40,11 @@ namespace: azure.mgmt.keyvault.v2021_04_01_preview output-folder: $(python-sdks-folder)/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2021_04_01_preview ``` -### Tag: package-preview-2020-04-full and python +### Tag: package-preview-2020-04 and python -These settings apply only when `--tag=package-preview-2020-04-full --python` is specified on the command line. +These settings apply only when `--tag=package-preview-2020-04 --python` is specified on the command line. -``` yaml $(tag) == 'package-preview-2020-04-full' +``` yaml $(tag) == 'package-preview-2020-04' namespace: azure.mgmt.keyvault.v2020_04_01_preview output-folder: $(python-sdks-folder)/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2020_04_01_preview ``` From afee30e4ef3f869960c22d7a4f7cc479539eaa74 Mon Sep 17 00:00:00 2001 From: Zed <601306339@qq.com> Date: Mon, 12 Apr 2021 13:57:39 +0800 Subject: [PATCH 5/5] add package version --- .../keyvault/resource-manager/readme.python.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/specification/keyvault/resource-manager/readme.python.md b/specification/keyvault/resource-manager/readme.python.md index 9ddaa9d75dbd..a2a5ddb5284d 100644 --- a/specification/keyvault/resource-manager/readme.python.md +++ b/specification/keyvault/resource-manager/readme.python.md @@ -4,10 +4,13 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. Use `--python-mode=update` if you already have a setup.py and just want to update the code itself. -``` yaml $(python) +``` yaml $(python) && $(track2) +python-mode: create azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION +namespace: azure.mgmt.keyvault package-name: azure-mgmt-keyvault +package-version: 1.0.0b1 no-namespace-folders: true ``` @@ -21,7 +24,7 @@ batch: - tag: package-2019-09 - tag: package-2018-02 - tag: package-2016-10 - - tag: package-preview-2020-04 + - tag: package-preview-2020-04-full - tag: package-preview-2021-04 - multiapiscript: true ``` @@ -40,11 +43,11 @@ namespace: azure.mgmt.keyvault.v2021_04_01_preview output-folder: $(python-sdks-folder)/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2021_04_01_preview ``` -### Tag: package-preview-2020-04 and python +### Tag: package-preview-2020-04-full and python -These settings apply only when `--tag=package-preview-2020-04 --python` is specified on the command line. +These settings apply only when `--tag=package-preview-2020-04-full --python` is specified on the command line. -``` yaml $(tag) == 'package-preview-2020-04' +``` yaml $(tag) == 'package-preview-2020-04-full' namespace: azure.mgmt.keyvault.v2020_04_01_preview output-folder: $(python-sdks-folder)/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2020_04_01_preview ```