From 0620797d639c7db12a8808d553dca20e59dab310 Mon Sep 17 00:00:00 2001 From: Riley McKenna Date: Fri, 23 Aug 2019 11:52:01 -0700 Subject: [PATCH 1/3] squashed changes. --- .../examples/CreatePeerAsn.json | 2 +- .../examples/ListLegacyPeerings.json | 2 +- .../peering/resource-manager/readme.go.md | 23 +++++--- .../peering/resource-manager/readme.md | 55 ++++++++++--------- .../peering/resource-manager/readme.ruby.md | 26 ++++----- 5 files changed, 59 insertions(+), 49 deletions(-) diff --git a/specification/peering/resource-manager/Microsoft.Peering/preview/2019-06-01-preview/examples/CreatePeerAsn.json b/specification/peering/resource-manager/Microsoft.Peering/preview/2019-06-01-preview/examples/CreatePeerAsn.json index 48aa730479ab..7b3ffa304c20 100644 --- a/specification/peering/resource-manager/Microsoft.Peering/preview/2019-06-01-preview/examples/CreatePeerAsn.json +++ b/specification/peering/resource-manager/Microsoft.Peering/preview/2019-06-01-preview/examples/CreatePeerAsn.json @@ -63,4 +63,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/peering/resource-manager/Microsoft.Peering/preview/2019-06-01-preview/examples/ListLegacyPeerings.json b/specification/peering/resource-manager/Microsoft.Peering/preview/2019-06-01-preview/examples/ListLegacyPeerings.json index 087dd18ffa3d..2c58ae19ac74 100644 --- a/specification/peering/resource-manager/Microsoft.Peering/preview/2019-06-01-preview/examples/ListLegacyPeerings.json +++ b/specification/peering/resource-manager/Microsoft.Peering/preview/2019-06-01-preview/examples/ListLegacyPeerings.json @@ -67,4 +67,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/peering/resource-manager/readme.go.md b/specification/peering/resource-manager/readme.go.md index 6a86af3a43e9..1d80260a6f42 100644 --- a/specification/peering/resource-manager/readme.go.md +++ b/specification/peering/resource-manager/readme.go.md @@ -14,16 +14,12 @@ go: ``` yaml $(go) && $(multiapi) batch: - - tag: package-2019-03-01-preview + - tag: package-2019-08-01-preview ``` - -### Tag: package-2019-03-01-preview and go - -These settings apply only when `--tag=package-2019-03-01-preview --go` is specified on the command line. -Please also specify `--go-sdk-folder=`. - -``` yaml $(tag) == 'package-2019-03-01-preview' && $(go) -output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2019-03-01-preview/$(namespace) +or +``` yaml $(go) && $(multiapi) +batch: + - tag: package-2019-08-01-preview ``` ### Tag: package-2019-08-01-preview and go @@ -34,3 +30,12 @@ Please also specify `--go-sdk-folder=`. + +``` yaml $(tag) == 'package-2019-06-01-preview' && $(go) +output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2019-06-01-preview/$(namespace) +``` diff --git a/specification/peering/resource-manager/readme.md b/specification/peering/resource-manager/readme.md index b0ce8bb3e4a9..5c617d75e782 100644 --- a/specification/peering/resource-manager/readme.md +++ b/specification/peering/resource-manager/readme.md @@ -21,44 +21,43 @@ To see additional help and options, run: ### Basic Information These are the global settings for the Peering API. - ``` yaml +title: PeeringManagementClient +description: Peering Client openapi-type: arm -tag: package-2019-03-01-preview +tag: package-2019-08-01-preview ``` or ``` yaml +title: PeeringManagementClient +description: Peering Client openapi-type: arm -tag: package-2019-06-01-preview +tag: package-2019-07-01-preview ``` or ``` yaml +title: PeeringManagementClient +description: Peering Client openapi-type: arm -tag: package-2019-07-01-preview +tag: package-2019-06-01-preview ``` or ``` yaml +title: PeeringManagementClient +description: Peering Client openapi-type: arm -tag: package-2019-08-01-preview +tag: package-2019-03-01-preview ``` -### Tag: package-2019-03-01-preview +### Tag: package-2019-08-01-preview -These settings apply only when `--tag=package-2019-03-01-preview` is specified on the command line. +These settings apply only when `--tag=package-2019-08-01-preview` is specified on the command line. -``` yaml $(tag) == 'package-2019-03-01-preview' +``` yaml $(tag) == 'package-2019-08-01-preview' input-file: -- Microsoft.Peering/preview/2019-03-01-preview/peering.json +- Microsoft.Peering/preview/2019-08-01-preview/peering.json ``` -### Tag: package-2019-06-01-preview - -These settings apply only when `--tag=package-2019-06-01-preview` is specified on the command line. - -``` yaml $(tag) == 'package-2019-06-01-preview' -input-file: -- Microsoft.Peering/preview/2019-06-01-preview/peering.json -``` ### Tag: package-2019-07-01-preview These settings apply only when `--tag=package-2019-07-01-preview` is specified on the command line. @@ -67,15 +66,23 @@ These settings apply only when `--tag=package-2019-07-01-preview` is specified o input-file: - Microsoft.Peering/preview/2019-07-01-preview/peering.json ``` +### Tag: package-2019-06-01-preview -### Tag: package-2019-08-01-preview +These settings apply only when `--tag=package-2019-06-01-preview` is specified on the command line. -These settings apply only when `--tag=package-2019-08-01-preview` is specified on the command line. +``` yaml $(tag) == 'package-2019-06-01-preview' +input-file: +- Microsoft.Peering/preview/2019-06-01-preview/peering.json +``` +### Tag: package-2019-03-01-preview -``` yaml $(tag) == 'package-2019-08-01-preview' +These settings apply only when `--tag=package-2019-03-01-preview` is specified on the command line. + +``` yaml $(tag) == 'package-2019-03-01-preview' input-file: -- Microsoft.Peering/preview/2019-08-01-preview/peering.json +- Microsoft.Peering/preview/2019-03-01-preview/peering.json ``` + # Code Generation ## Swagger to SDK @@ -115,7 +122,6 @@ require: $(this-folder)/../../../profiles/readme.md # all the input files across all versions input-file: - - $(this-folder)/Microsoft.Peering/preview/2019-03-01-preview/peering.json - $(this-folder)/Microsoft.Peering/preview/2019-06-01-preview/peering.json - $(this-folder)/Microsoft.Peering/preview/2019-07-01-preview/peering.json - $(this-folder)/Microsoft.Peering/preview/2019-08-01-preview/peering.json @@ -126,7 +132,6 @@ If there are files that should not be in the `all-api-versions` set, uncomment the `exclude-file` section below and add the file paths. ``` yaml $(tag) == 'all-api-versions' -#exclude-file: -# - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json +exclude-file: +- $(this-folder)/Microsoft.Peering/preview/2019-03-01-preview/peering.json ``` - diff --git a/specification/peering/resource-manager/readme.ruby.md b/specification/peering/resource-manager/readme.ruby.md index d2004e8c5b69..55ec2c40ddf9 100644 --- a/specification/peering/resource-manager/readme.ruby.md +++ b/specification/peering/resource-manager/readme.ruby.md @@ -4,43 +4,43 @@ These settings apply only when `--ruby` is specified on the command line. ``` yaml package-name: azure_mgmt_peering -package-version: "2019-03-01-preview" +package-version: "2019-08-01-preview" azure-arm: true ``` or ``` yaml package-name: azure_mgmt_peering -package-version: "2019-08-01-preview" +package-version: "2019-06-01-preview" azure-arm: true ``` ### Ruby multi-api - ``` yaml $(ruby) && $(multiapi) batch: - - tag: package-2019-03-01-preview + - tag: package-2019-08-01-preview ``` or ``` yaml $(ruby) && $(multiapi) batch: - - tag: package-2019-08-01-preview + - tag: package-2019-06-01-preview ``` -### Tag: package-2019-03-01-preview and ruby +### Tag: package-2019-08-01-preview and ruby -These settings apply only when `--tag=package-2019-03-01-preview --ruby` is specified on the command line. +These settings apply only when `--tag=package-2019-08-01-preview --ruby` is specified on the command line. Please also specify `--ruby-sdks-folder=`. -``` yaml $(tag) == 'package-2019-03-01-preview' && $(ruby) -namespace: "Azure::Peering::Mgmt::V2019_03_01_preview" +``` yaml $(tag) == 'package-2019-08-01-preview' && $(ruby) +namespace: "Azure::Peering::Mgmt::V2019_08_01_preview" output-folder: $(ruby-sdks-folder)/management/azure_mgmt_peering/lib ``` -### Tag: package-2019-08-01-preview and ruby -These settings apply only when `--tag=package-2019-08-01-preview --ruby` is specified on the command line. +### Tag: package-2019-06-01-preview and ruby + +These settings apply only when `--tag=package-2019-06-01-preview --ruby` is specified on the command line. Please also specify `--ruby-sdks-folder=`. -``` yaml $(tag) == 'package-2019-08-01-preview' && $(ruby) -namespace: "Azure::Peering::Mgmt::V2019_08_01_preview" +``` yaml $(tag) == 'package-2019-06-01-preview' && $(ruby) +namespace: "Azure::Peering::Mgmt::V2019_06_01_preview" output-folder: $(ruby-sdks-folder)/management/azure_mgmt_peering/lib ``` \ No newline at end of file From c9ebb0ad33ec10b3bb82a77121b24be44a9e11fc Mon Sep 17 00:00:00 2001 From: Riley McKenna Date: Mon, 26 Aug 2019 09:55:08 -0700 Subject: [PATCH 2/3] Update CreatePeerAsn.json --- .../preview/2019-06-01-preview/examples/CreatePeerAsn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/peering/resource-manager/Microsoft.Peering/preview/2019-06-01-preview/examples/CreatePeerAsn.json b/specification/peering/resource-manager/Microsoft.Peering/preview/2019-06-01-preview/examples/CreatePeerAsn.json index 7b3ffa304c20..48aa730479ab 100644 --- a/specification/peering/resource-manager/Microsoft.Peering/preview/2019-06-01-preview/examples/CreatePeerAsn.json +++ b/specification/peering/resource-manager/Microsoft.Peering/preview/2019-06-01-preview/examples/CreatePeerAsn.json @@ -63,4 +63,4 @@ } } } -} \ No newline at end of file +} From cce264ba7c751076c58518d67e19b9e469832c0c Mon Sep 17 00:00:00 2001 From: Riley McKenna Date: Mon, 26 Aug 2019 09:55:25 -0700 Subject: [PATCH 3/3] Update ListLegacyPeerings.json --- .../preview/2019-06-01-preview/examples/ListLegacyPeerings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/peering/resource-manager/Microsoft.Peering/preview/2019-06-01-preview/examples/ListLegacyPeerings.json b/specification/peering/resource-manager/Microsoft.Peering/preview/2019-06-01-preview/examples/ListLegacyPeerings.json index 2c58ae19ac74..087dd18ffa3d 100644 --- a/specification/peering/resource-manager/Microsoft.Peering/preview/2019-06-01-preview/examples/ListLegacyPeerings.json +++ b/specification/peering/resource-manager/Microsoft.Peering/preview/2019-06-01-preview/examples/ListLegacyPeerings.json @@ -67,4 +67,4 @@ } } } -} \ No newline at end of file +}