From 69c2ed7f134146d9f72ce343385ec19d393f806d Mon Sep 17 00:00:00 2001 From: Eli Arbel Date: Thu, 25 Feb 2021 15:33:44 +0200 Subject: [PATCH 1/2] ADP: fix cli codegen --- specification/adp/resource-manager/readme.cli.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/specification/adp/resource-manager/readme.cli.md b/specification/adp/resource-manager/readme.cli.md index e1b3ab200497..33940b164f37 100644 --- a/specification/adp/resource-manager/readme.cli.md +++ b/specification/adp/resource-manager/readme.cli.md @@ -2,11 +2,10 @@ These settings don't need to apply `--cli` on the command line. -``` yaml -cli: - cli-directive: - - where: - type: DataPoolLocation - prop: encryption - cli-flatten: true +``` yaml $(azure-cli-extension-folder) != '' +directive: +- from: swagger-document + where: $.definitions.DataPoolLocation + transform: > + $.properties.encryption["x-ms-client-flatten"] = true; ``` From db39b2f5bb9ad5304f131fdfe0558047868e077b Mon Sep 17 00:00:00 2001 From: Eli Arbel Date: Mon, 1 Mar 2021 10:34:11 +0200 Subject: [PATCH 2/2] Move directive --- specification/adp/resource-manager/readme.az.md | 6 ++++++ specification/adp/resource-manager/readme.cli.md | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/specification/adp/resource-manager/readme.az.md b/specification/adp/resource-manager/readme.az.md index ad394bde867b..3e0ecfd6e75d 100644 --- a/specification/adp/resource-manager/readme.az.md +++ b/specification/adp/resource-manager/readme.az.md @@ -9,4 +9,10 @@ az: package-name: azure-mgmt-adp az-output-folder: $(azure-cli-extension-folder)/src/adp python-sdk-output-folder: "$(az-output-folder)/azext_adp/vendored_sdks/adp" + +directive: +- from: swagger-document + where: $.definitions.DataPoolLocation + transform: > + $.properties.encryption["x-ms-client-flatten"] = true; ``` diff --git a/specification/adp/resource-manager/readme.cli.md b/specification/adp/resource-manager/readme.cli.md index 33940b164f37..b7ee37d8290c 100644 --- a/specification/adp/resource-manager/readme.cli.md +++ b/specification/adp/resource-manager/readme.cli.md @@ -1,11 +1,3 @@ ## CLI These settings don't need to apply `--cli` on the command line. - -``` yaml $(azure-cli-extension-folder) != '' -directive: -- from: swagger-document - where: $.definitions.DataPoolLocation - transform: > - $.properties.encryption["x-ms-client-flatten"] = true; -```