From 70d1643925485ae7e9814d49cc96cc78d3c24176 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Fri, 10 Dec 2021 08:26:07 +0000 Subject: [PATCH] CodeGen from PR 17039 in Azure/azure-rest-api-specs [Go] Add other resources module name (#17039) * [Go] Add other resources module name * fix --- .../resources/armresources/CHANGELOG.md | 12 ++++++++++++ .../resources/armresources/autorest.md | 6 +++--- .../resources/armresources/go.mod | 3 +-- .../resources/armresources/go.sum | 7 +++---- .../armresources/zz_generated_constants.go | 2 +- .../armresources/zz_generated_models.go | 18 +++++++++++++++++- 6 files changed, 37 insertions(+), 11 deletions(-) diff --git a/sdk/resourcemanager/resources/armresources/CHANGELOG.md b/sdk/resourcemanager/resources/armresources/CHANGELOG.md index a9a978467a6f..6d739153280e 100644 --- a/sdk/resourcemanager/resources/armresources/CHANGELOG.md +++ b/sdk/resourcemanager/resources/armresources/CHANGELOG.md @@ -1,5 +1,17 @@ # Release History +## 0.2.2 (2021-12-10) +### Breaking Changes + +### Features Added + +- New function `ZoneMapping.MarshalJSON() ([]byte, error)` +- New struct `ZoneMapping` +- New field `ZoneMappings` in struct `ProviderResourceType` + +Total 0 breaking change(s), 4 additive change(s). + + ## 0.2.1 (2021-11-26) ### Other Changes diff --git a/sdk/resourcemanager/resources/armresources/autorest.md b/sdk/resourcemanager/resources/armresources/autorest.md index 772a42ac4120..dc54c976dfcf 100644 --- a/sdk/resourcemanager/resources/armresources/autorest.md +++ b/sdk/resourcemanager/resources/armresources/autorest.md @@ -5,9 +5,9 @@ ``` yaml azure-arm: true require: -- https://github.com/Azure/azure-rest-api-specs/blob/69eacf00a36d565d3220d5dd6f4a5293664f1ae9/specification/resources/resource-manager/readme.md -- https://github.com/Azure/azure-rest-api-specs/blob/69eacf00a36d565d3220d5dd6f4a5293664f1ae9/specification/resources/resource-manager/readme.go.md +- /home/vsts/work/1/s/azure-rest-api-specs/specification/resources/resource-manager/readme.md +- /home/vsts/work/1/s/azure-rest-api-specs/specification/resources/resource-manager/readme.go.md license-header: MICROSOFT_MIT_NO_VERSION -module-version: 0.2.1 +module-version: 0.2.2 package-resources: true ``` \ No newline at end of file diff --git a/sdk/resourcemanager/resources/armresources/go.mod b/sdk/resourcemanager/resources/armresources/go.mod index 38d7e472801d..6d3fc1d91aca 100644 --- a/sdk/resourcemanager/resources/armresources/go.mod +++ b/sdk/resourcemanager/resources/armresources/go.mod @@ -3,8 +3,7 @@ module github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresour go 1.16 require ( - github.com/Azure/azure-sdk-for-go v59.0.0+incompatible + github.com/Azure/azure-sdk-for-go v60.1.0+incompatible github.com/Azure/azure-sdk-for-go/sdk/azcore v0.20.0 github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.12.0 - github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.2 // indirect ) diff --git a/sdk/resourcemanager/resources/armresources/go.sum b/sdk/resourcemanager/resources/armresources/go.sum index dec91a414369..35739a609db5 100644 --- a/sdk/resourcemanager/resources/armresources/go.sum +++ b/sdk/resourcemanager/resources/armresources/go.sum @@ -1,12 +1,11 @@ -github.com/Azure/azure-sdk-for-go v59.0.0+incompatible h1:I1ULJqny1qQhUBFy11yDXHhW3pLvbhwV0PTn7mjp9V0= -github.com/Azure/azure-sdk-for-go v59.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v60.1.0+incompatible h1:j6y8ddurcaiyLfwBwPmJFaunp6BDzyQTuAgMrm1r++o= +github.com/Azure/azure-sdk-for-go v60.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.20.0 h1:KQgdWmEOmaJKxaUUZwHAYh12t+b+ZJf8q3friycK1kA= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.20.0/go.mod h1:ZPW/Z0kLCTdDZaDbYTetxc9Cxl/2lNqxYHYNOF2bti0= github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.12.0 h1:VBvHGLJbaY0+c66NZHdS9cgjHVYSH6DDa0XJMyrblsI= github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.12.0/go.mod h1:GJzjM4SR9T0KyX5gKCVyz1ytD8FeWeUPCwtFCt1AyfE= +github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.1 h1:BUYIbDf/mMZ8945v3QkG3OuqGVyS4Iek0AOLwdRAYoc= github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.1/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= -github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.2 h1:rImM7Yjz9yUgpdxp3A4cZLm1JZuo4XbtIp2LrUZnwYw= -github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.2/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/sdk/resourcemanager/resources/armresources/zz_generated_constants.go b/sdk/resourcemanager/resources/armresources/zz_generated_constants.go index 13b5eaa9ed2f..6a09fa686d09 100644 --- a/sdk/resourcemanager/resources/armresources/zz_generated_constants.go +++ b/sdk/resourcemanager/resources/armresources/zz_generated_constants.go @@ -10,7 +10,7 @@ package armresources const ( module = "armresources" - version = "v0.2.1" + version = "v0.2.2" ) // AliasPathAttributes - The attributes of the token that the alias path is referring to. diff --git a/sdk/resourcemanager/resources/armresources/zz_generated_models.go b/sdk/resourcemanager/resources/armresources/zz_generated_models.go index 76ce0c6c4e1f..40d9cd5d045c 100644 --- a/sdk/resourcemanager/resources/armresources/zz_generated_models.go +++ b/sdk/resourcemanager/resources/armresources/zz_generated_models.go @@ -1395,7 +1395,8 @@ type ProviderResourceType struct { Properties map[string]*string `json:"properties,omitempty"` // The resource type. - ResourceType *string `json:"resourceType,omitempty"` + ResourceType *string `json:"resourceType,omitempty"` + ZoneMappings []*ZoneMapping `json:"zoneMappings,omitempty"` // READ-ONLY; The API profiles for the resource provider. APIProfiles []*APIProfile `json:"apiProfiles,omitempty" azure:"ro"` @@ -1416,6 +1417,7 @@ func (p ProviderResourceType) MarshalJSON() ([]byte, error) { populate(objectMap, "locations", p.Locations) populate(objectMap, "properties", p.Properties) populate(objectMap, "resourceType", p.ResourceType) + populate(objectMap, "zoneMappings", p.ZoneMappings) return json.Marshal(objectMap) } @@ -2242,6 +2244,20 @@ func (w WhatIfPropertyChange) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } +type ZoneMapping struct { + // The location of the zone mapping. + Location *string `json:"location,omitempty"` + Zones []*string `json:"zones,omitempty"` +} + +// MarshalJSON implements the json.Marshaller interface for type ZoneMapping. +func (z ZoneMapping) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + populate(objectMap, "location", z.Location) + populate(objectMap, "zones", z.Zones) + return json.Marshal(objectMap) +} + func populate(m map[string]interface{}, k string, v interface{}) { if v == nil { return