From 2470a6c9ad7ecc6c8b5baf04aeb78d5df9920776 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Thu, 12 May 2022 01:09:40 +0000 Subject: [PATCH] CodeGen from PR 19037 in Azure/azure-rest-api-specs Merge cb93a3a577196e7a5a702b096f817a575dc8df81 into 32143b0f5f230ee2601e3c5d1990188666a5058d --- .../mgmt/2017-11-30/consumption/CHANGELOG.md | 2 +- .../mgmt/2017-11-30/consumption/_meta.json | 2 +- .../mgmt/2018-01-31/consumption/CHANGELOG.md | 2 +- .../mgmt/2018-01-31/consumption/_meta.json | 2 +- .../mgmt/2018-03-31/consumption/CHANGELOG.md | 2 +- .../mgmt/2018-03-31/consumption/_meta.json | 2 +- .../mgmt/2018-05-31/consumption/CHANGELOG.md | 2 +- .../mgmt/2018-05-31/consumption/_meta.json | 2 +- .../mgmt/2018-06-30/consumption/CHANGELOG.md | 2 +- .../mgmt/2018-06-30/consumption/_meta.json | 2 +- .../mgmt/2018-08-31/consumption/CHANGELOG.md | 2 +- .../mgmt/2018-08-31/consumption/_meta.json | 2 +- .../mgmt/2018-10-01/consumption/CHANGELOG.md | 2 +- .../mgmt/2018-10-01/consumption/_meta.json | 2 +- .../mgmt/2019-01-01/consumption/CHANGELOG.md | 2 +- .../mgmt/2019-01-01/consumption/_meta.json | 2 +- .../mgmt/2019-10-01/consumption/CHANGELOG.md | 10 ++++++- .../mgmt/2019-10-01/consumption/_meta.json | 2 +- .../mgmt/2019-10-01/consumption/models.go | 27 +------------------ .../consumption/CHANGELOG.md | 2 +- .../2017-04-24-preview/consumption/_meta.json | 2 +- .../consumption/CHANGELOG.md | 2 +- .../2017-12-30-preview/consumption/_meta.json | 2 +- 23 files changed, 31 insertions(+), 48 deletions(-) diff --git a/services/consumption/mgmt/2017-11-30/consumption/CHANGELOG.md b/services/consumption/mgmt/2017-11-30/consumption/CHANGELOG.md index 52911e4cc5e4..a1ecf841edb0 100644 --- a/services/consumption/mgmt/2017-11-30/consumption/CHANGELOG.md +++ b/services/consumption/mgmt/2017-11-30/consumption/CHANGELOG.md @@ -1,2 +1,2 @@ -# Change History +# Unreleased diff --git a/services/consumption/mgmt/2017-11-30/consumption/_meta.json b/services/consumption/mgmt/2017-11-30/consumption/_meta.json index f4413b8334d1..82ca9c116aa1 100644 --- a/services/consumption/mgmt/2017-11-30/consumption/_meta.json +++ b/services/consumption/mgmt/2017-11-30/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "c17467ca1ae584ae8e8ca0b2770b4b6535340cfb", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2017-11", "use": "@microsoft.azure/autorest.go@2.1.187", diff --git a/services/consumption/mgmt/2018-01-31/consumption/CHANGELOG.md b/services/consumption/mgmt/2018-01-31/consumption/CHANGELOG.md index 52911e4cc5e4..a1ecf841edb0 100644 --- a/services/consumption/mgmt/2018-01-31/consumption/CHANGELOG.md +++ b/services/consumption/mgmt/2018-01-31/consumption/CHANGELOG.md @@ -1,2 +1,2 @@ -# Change History +# Unreleased diff --git a/services/consumption/mgmt/2018-01-31/consumption/_meta.json b/services/consumption/mgmt/2018-01-31/consumption/_meta.json index 189fbb1e56d3..cae2d67195c4 100644 --- a/services/consumption/mgmt/2018-01-31/consumption/_meta.json +++ b/services/consumption/mgmt/2018-01-31/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "c17467ca1ae584ae8e8ca0b2770b4b6535340cfb", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2018-01", "use": "@microsoft.azure/autorest.go@2.1.187", diff --git a/services/consumption/mgmt/2018-03-31/consumption/CHANGELOG.md b/services/consumption/mgmt/2018-03-31/consumption/CHANGELOG.md index 52911e4cc5e4..a1ecf841edb0 100644 --- a/services/consumption/mgmt/2018-03-31/consumption/CHANGELOG.md +++ b/services/consumption/mgmt/2018-03-31/consumption/CHANGELOG.md @@ -1,2 +1,2 @@ -# Change History +# Unreleased diff --git a/services/consumption/mgmt/2018-03-31/consumption/_meta.json b/services/consumption/mgmt/2018-03-31/consumption/_meta.json index f2e9563209aa..1e5cf4c3d8a9 100644 --- a/services/consumption/mgmt/2018-03-31/consumption/_meta.json +++ b/services/consumption/mgmt/2018-03-31/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "c17467ca1ae584ae8e8ca0b2770b4b6535340cfb", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2018-03", "use": "@microsoft.azure/autorest.go@2.1.187", diff --git a/services/consumption/mgmt/2018-05-31/consumption/CHANGELOG.md b/services/consumption/mgmt/2018-05-31/consumption/CHANGELOG.md index 52911e4cc5e4..a1ecf841edb0 100644 --- a/services/consumption/mgmt/2018-05-31/consumption/CHANGELOG.md +++ b/services/consumption/mgmt/2018-05-31/consumption/CHANGELOG.md @@ -1,2 +1,2 @@ -# Change History +# Unreleased diff --git a/services/consumption/mgmt/2018-05-31/consumption/_meta.json b/services/consumption/mgmt/2018-05-31/consumption/_meta.json index 3078a45f9581..296126a2de35 100644 --- a/services/consumption/mgmt/2018-05-31/consumption/_meta.json +++ b/services/consumption/mgmt/2018-05-31/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "c17467ca1ae584ae8e8ca0b2770b4b6535340cfb", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2018-05", "use": "@microsoft.azure/autorest.go@2.1.187", diff --git a/services/consumption/mgmt/2018-06-30/consumption/CHANGELOG.md b/services/consumption/mgmt/2018-06-30/consumption/CHANGELOG.md index 52911e4cc5e4..a1ecf841edb0 100644 --- a/services/consumption/mgmt/2018-06-30/consumption/CHANGELOG.md +++ b/services/consumption/mgmt/2018-06-30/consumption/CHANGELOG.md @@ -1,2 +1,2 @@ -# Change History +# Unreleased diff --git a/services/consumption/mgmt/2018-06-30/consumption/_meta.json b/services/consumption/mgmt/2018-06-30/consumption/_meta.json index 6346d9a679d1..63d25f7301d2 100644 --- a/services/consumption/mgmt/2018-06-30/consumption/_meta.json +++ b/services/consumption/mgmt/2018-06-30/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "c17467ca1ae584ae8e8ca0b2770b4b6535340cfb", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2018-06", "use": "@microsoft.azure/autorest.go@2.1.187", diff --git a/services/consumption/mgmt/2018-08-31/consumption/CHANGELOG.md b/services/consumption/mgmt/2018-08-31/consumption/CHANGELOG.md index 52911e4cc5e4..a1ecf841edb0 100644 --- a/services/consumption/mgmt/2018-08-31/consumption/CHANGELOG.md +++ b/services/consumption/mgmt/2018-08-31/consumption/CHANGELOG.md @@ -1,2 +1,2 @@ -# Change History +# Unreleased diff --git a/services/consumption/mgmt/2018-08-31/consumption/_meta.json b/services/consumption/mgmt/2018-08-31/consumption/_meta.json index 39fc0ca68f74..2989938b18f5 100644 --- a/services/consumption/mgmt/2018-08-31/consumption/_meta.json +++ b/services/consumption/mgmt/2018-08-31/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "c17467ca1ae584ae8e8ca0b2770b4b6535340cfb", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2018-08", "use": "@microsoft.azure/autorest.go@2.1.187", diff --git a/services/consumption/mgmt/2018-10-01/consumption/CHANGELOG.md b/services/consumption/mgmt/2018-10-01/consumption/CHANGELOG.md index 52911e4cc5e4..a1ecf841edb0 100644 --- a/services/consumption/mgmt/2018-10-01/consumption/CHANGELOG.md +++ b/services/consumption/mgmt/2018-10-01/consumption/CHANGELOG.md @@ -1,2 +1,2 @@ -# Change History +# Unreleased diff --git a/services/consumption/mgmt/2018-10-01/consumption/_meta.json b/services/consumption/mgmt/2018-10-01/consumption/_meta.json index 9fc05c1d4f66..3169758a36d6 100644 --- a/services/consumption/mgmt/2018-10-01/consumption/_meta.json +++ b/services/consumption/mgmt/2018-10-01/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "c17467ca1ae584ae8e8ca0b2770b4b6535340cfb", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2018-10", "use": "@microsoft.azure/autorest.go@2.1.187", diff --git a/services/consumption/mgmt/2019-01-01/consumption/CHANGELOG.md b/services/consumption/mgmt/2019-01-01/consumption/CHANGELOG.md index 52911e4cc5e4..a1ecf841edb0 100644 --- a/services/consumption/mgmt/2019-01-01/consumption/CHANGELOG.md +++ b/services/consumption/mgmt/2019-01-01/consumption/CHANGELOG.md @@ -1,2 +1,2 @@ -# Change History +# Unreleased diff --git a/services/consumption/mgmt/2019-01-01/consumption/_meta.json b/services/consumption/mgmt/2019-01-01/consumption/_meta.json index 533d504307d8..93edbe62db47 100644 --- a/services/consumption/mgmt/2019-01-01/consumption/_meta.json +++ b/services/consumption/mgmt/2019-01-01/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "c17467ca1ae584ae8e8ca0b2770b4b6535340cfb", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2019-01", "use": "@microsoft.azure/autorest.go@2.1.187", diff --git a/services/consumption/mgmt/2019-10-01/consumption/CHANGELOG.md b/services/consumption/mgmt/2019-10-01/consumption/CHANGELOG.md index 52911e4cc5e4..387d82396cb2 100644 --- a/services/consumption/mgmt/2019-10-01/consumption/CHANGELOG.md +++ b/services/consumption/mgmt/2019-10-01/consumption/CHANGELOG.md @@ -1,2 +1,10 @@ -# Change History +# Unreleased +## Breaking Changes + +### Struct Changes + +#### Removed Struct Fields + +1. ModernReservationRecommendation.ETag +1. ReservationRecommendationDetailsModel.ETag diff --git a/services/consumption/mgmt/2019-10-01/consumption/_meta.json b/services/consumption/mgmt/2019-10-01/consumption/_meta.json index a30de8aabb19..cd3d735dbfbe 100644 --- a/services/consumption/mgmt/2019-10-01/consumption/_meta.json +++ b/services/consumption/mgmt/2019-10-01/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "b47572ab2069865484c493a4f679d4e72f8b303d", + "commit": "c17467ca1ae584ae8e8ca0b2770b4b6535340cfb", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2019-10", "use": "@microsoft.azure/autorest.go@2.1.187", diff --git a/services/consumption/mgmt/2019-10-01/consumption/models.go b/services/consumption/mgmt/2019-10-01/consumption/models.go index f03c9a1f1a7e..c9404750fd26 100644 --- a/services/consumption/mgmt/2019-10-01/consumption/models.go +++ b/services/consumption/mgmt/2019-10-01/consumption/models.go @@ -3032,8 +3032,6 @@ func (mcsp ModernChargeSummaryProperties) MarshalJSON() ([]byte, error) { type ModernReservationRecommendation struct { // ModernReservationRecommendationProperties - Properties for modern reservation recommendation *ModernReservationRecommendationProperties `json:"properties,omitempty"` - // ETag - READ-ONLY; Resource eTag. - ETag *string `json:"eTag,omitempty"` // ID - READ-ONLY; Resource Id. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. @@ -3103,15 +3101,6 @@ func (mrr *ModernReservationRecommendation) UnmarshalJSON(body []byte) error { } mrr.ModernReservationRecommendationProperties = &modernReservationRecommendationProperties } - case "eTag": - if v != nil { - var eTag string - err = json.Unmarshal(*v, &eTag) - if err != nil { - return err - } - mrr.ETag = &eTag - } case "id": if v != nil { var ID string @@ -4622,9 +4611,7 @@ type ReservationRecommendationDetailsModel struct { // Location - Resource Location. Location *string `json:"location,omitempty"` // Sku - Resource sku - Sku *string `json:"sku,omitempty"` - // ETag - Resource eTag. - ETag *string `json:"eTag,omitempty"` + Sku *string `json:"sku,omitempty"` *ReservationRecommendationDetailsProperties `json:"properties,omitempty"` // ID - READ-ONLY; Resource Id. ID *string `json:"id,omitempty"` @@ -4647,9 +4634,6 @@ func (rrdm ReservationRecommendationDetailsModel) MarshalJSON() ([]byte, error) if rrdm.Sku != nil { objectMap["sku"] = rrdm.Sku } - if rrdm.ETag != nil { - objectMap["eTag"] = rrdm.ETag - } if rrdm.ReservationRecommendationDetailsProperties != nil { objectMap["properties"] = rrdm.ReservationRecommendationDetailsProperties } @@ -4683,15 +4667,6 @@ func (rrdm *ReservationRecommendationDetailsModel) UnmarshalJSON(body []byte) er } rrdm.Sku = &sku } - case "eTag": - if v != nil { - var eTag string - err = json.Unmarshal(*v, &eTag) - if err != nil { - return err - } - rrdm.ETag = &eTag - } case "properties": if v != nil { var reservationRecommendationDetailsProperties ReservationRecommendationDetailsProperties diff --git a/services/preview/consumption/mgmt/2017-04-24-preview/consumption/CHANGELOG.md b/services/preview/consumption/mgmt/2017-04-24-preview/consumption/CHANGELOG.md index 52911e4cc5e4..a1ecf841edb0 100644 --- a/services/preview/consumption/mgmt/2017-04-24-preview/consumption/CHANGELOG.md +++ b/services/preview/consumption/mgmt/2017-04-24-preview/consumption/CHANGELOG.md @@ -1,2 +1,2 @@ -# Change History +# Unreleased diff --git a/services/preview/consumption/mgmt/2017-04-24-preview/consumption/_meta.json b/services/preview/consumption/mgmt/2017-04-24-preview/consumption/_meta.json index fb6b9e4cdbe7..db75998e7326 100644 --- a/services/preview/consumption/mgmt/2017-04-24-preview/consumption/_meta.json +++ b/services/preview/consumption/mgmt/2017-04-24-preview/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "c17467ca1ae584ae8e8ca0b2770b4b6535340cfb", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2017-04-preview", "use": "@microsoft.azure/autorest.go@2.1.187", diff --git a/services/preview/consumption/mgmt/2017-12-30-preview/consumption/CHANGELOG.md b/services/preview/consumption/mgmt/2017-12-30-preview/consumption/CHANGELOG.md index 52911e4cc5e4..a1ecf841edb0 100644 --- a/services/preview/consumption/mgmt/2017-12-30-preview/consumption/CHANGELOG.md +++ b/services/preview/consumption/mgmt/2017-12-30-preview/consumption/CHANGELOG.md @@ -1,2 +1,2 @@ -# Change History +# Unreleased diff --git a/services/preview/consumption/mgmt/2017-12-30-preview/consumption/_meta.json b/services/preview/consumption/mgmt/2017-12-30-preview/consumption/_meta.json index 1b5159925cdb..cae5ff355f30 100644 --- a/services/preview/consumption/mgmt/2017-12-30-preview/consumption/_meta.json +++ b/services/preview/consumption/mgmt/2017-12-30-preview/consumption/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "c17467ca1ae584ae8e8ca0b2770b4b6535340cfb", "readme": "/_/azure-rest-api-specs/specification/consumption/resource-manager/readme.md", "tag": "package-2017-12-preview", "use": "@microsoft.azure/autorest.go@2.1.187",