Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Azure Go SDK to v59.0.0 #13943

Merged
merged 4 commits into from
Nov 2, 2021
Merged

Upgrade Azure Go SDK to v59.0.0 #13943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4084ae
update Azure Go SDK to v59.0.0
magodo Oct 28, 2021
f290441
go mod tidy
magodo Oct 29, 2021
9c9c4cb
Update internal/services/containers/container_registry_data_source.go
katbyte Nov 2, 2021
7ada58c
Update internal/services/containers/container_registry_resource.go
katbyte Nov 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/hashicorp/terraform-provider-azurerm

require (
cloud.google.com/go/storage v1.16.0 // indirect
github.com/Azure/azure-sdk-for-go v58.0.0+incompatible
github.com/Azure/azure-sdk-for-go v59.0.0+incompatible
github.com/Azure/go-autorest/autorest v0.11.19
github.com/Azure/go-autorest/autorest/date v0.3.0
github.com/Azure/go-autorest/autorest/to v0.4.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7
github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v51.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v56.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v58.0.0+incompatible h1:Cw16jiP4dI+CK761aq44ol4RV5dUiIIXky1+EKpoiVM=
github.com/Azure/azure-sdk-for-go v58.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
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/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
github.com/Azure/go-autorest/autorest v0.11.3/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw=
Expand Down
22 changes: 11 additions & 11 deletions internal/services/cdn/cdn_endpoint_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ func resourceCdnEndpoint() *pluginsdk.Resource {
Type: pluginsdk.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{
string(cdn.Allow),
string(cdn.Block),
string(cdn.ActionTypeAllow),
string(cdn.ActionTypeBlock),
}, true),
DiffSuppressFunc: suppress.CaseDifference,
},
Expand All @@ -184,11 +184,11 @@ func resourceCdnEndpoint() *pluginsdk.Resource {
Type: pluginsdk.TypeString,
Optional: true,
ValidateFunc: validation.StringInSlice([]string{
string(cdn.DynamicSiteAcceleration),
string(cdn.GeneralMediaStreaming),
string(cdn.GeneralWebDelivery),
string(cdn.LargeFileDownload),
string(cdn.VideoOnDemandMediaStreaming),
string(cdn.OptimizationTypeDynamicSiteAcceleration),
string(cdn.OptimizationTypeGeneralMediaStreaming),
string(cdn.OptimizationTypeGeneralWebDelivery),
string(cdn.OptimizationTypeLargeFileDownload),
string(cdn.OptimizationTypeVideoOnDemandMediaStreaming),
}, true),
DiffSuppressFunc: suppress.CaseDifference,
},
Expand Down Expand Up @@ -295,11 +295,11 @@ func resourceCdnEndpointCreate(d *pluginsdk.ResourceData, meta interface{}) erro
return fmt.Errorf("expanding `global_delivery_rule` or `delivery_rule`: %s", err)
}

if profile.Sku.Name != cdn.StandardMicrosoft && len(*deliveryPolicy.Rules) > 0 {
if profile.Sku.Name != cdn.SkuNameStandardMicrosoft && len(*deliveryPolicy.Rules) > 0 {
return fmt.Errorf("`global_delivery_rule` and `delivery_rule` are only allowed when `Standard_Microsoft` sku is used. Profile sku: %s", profile.Sku.Name)
}

if profile.Sku.Name == cdn.StandardMicrosoft {
if profile.Sku.Name == cdn.SkuNameStandardMicrosoft {
endpoint.EndpointProperties.DeliveryPolicy = deliveryPolicy
}
}
Expand Down Expand Up @@ -399,11 +399,11 @@ func resourceCdnEndpointUpdate(d *pluginsdk.ResourceData, meta interface{}) erro
return fmt.Errorf("expanding `global_delivery_rule` or `delivery_rule`: %s", err)
}

if profile.Sku.Name != cdn.StandardMicrosoft && len(*deliveryPolicy.Rules) > 0 {
if profile.Sku.Name != cdn.SkuNameStandardMicrosoft && len(*deliveryPolicy.Rules) > 0 {
return fmt.Errorf("`global_delivery_rule` and `delivery_rule` are only allowed when `Standard_Microsoft` sku is used. Profile sku: %s", profile.Sku.Name)
}

if profile.Sku.Name == cdn.StandardMicrosoft {
if profile.Sku.Name == cdn.SkuNameStandardMicrosoft {
endpoint.EndpointPropertiesUpdateParameters.DeliveryPolicy = deliveryPolicy
}
}
Expand Down
10 changes: 5 additions & 5 deletions internal/services/cdn/cdn_profile_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ func resourceCdnProfile() *pluginsdk.Resource {
Required: true,
ForceNew: true,
ValidateFunc: validation.StringInSlice([]string{
string(cdn.StandardAkamai),
string(cdn.StandardChinaCdn),
string(cdn.StandardVerizon),
string(cdn.StandardMicrosoft),
string(cdn.PremiumVerizon),
string(cdn.SkuNameStandardAkamai),
string(cdn.SkuNameStandardChinaCdn),
string(cdn.SkuNameStandardVerizon),
string(cdn.SkuNameStandardMicrosoft),
string(cdn.SkuNamePremiumVerizon),
}, true),
DiffSuppressFunc: suppress.CaseDifference,
},
Expand Down
10 changes: 5 additions & 5 deletions internal/services/cdn/deliveryruleactions/cache_expiration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ func CacheExpiration() *pluginsdk.Resource {
Type: pluginsdk.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{
string(cdn.BypassCache),
string(cdn.Override),
string(cdn.SetIfMissing),
string(cdn.CacheBehaviorBypassCache),
string(cdn.CacheBehaviorOverride),
string(cdn.CacheBehaviorSetIfMissing),
}, false),
},

Expand All @@ -39,7 +39,7 @@ func ExpandArmCdnEndpointActionCacheExpiration(input []interface{}) (*[]cdn.Basi
item := v.(map[string]interface{})

cacheExpirationAction := cdn.DeliveryRuleCacheExpirationAction{
Name: cdn.NameCacheExpiration,
Name: cdn.NameBasicDeliveryRuleActionNameCacheExpiration,
Parameters: &cdn.CacheExpirationActionParameters{
OdataType: utils.String("Microsoft.Azure.Cdn.Models.DeliveryRuleCacheExpirationActionParameters"),
CacheBehavior: cdn.CacheBehavior(item["behavior"].(string)),
Expand All @@ -48,7 +48,7 @@ func ExpandArmCdnEndpointActionCacheExpiration(input []interface{}) (*[]cdn.Basi
}

if duration := item["duration"].(string); duration != "" {
if cacheExpirationAction.Parameters.CacheBehavior == cdn.BypassCache {
if cacheExpirationAction.Parameters.CacheBehavior == cdn.CacheBehaviorBypassCache {
return nil, fmt.Errorf("Cache expiration duration must not be set when using behavior `BypassCache`")
}

Expand Down
12 changes: 6 additions & 6 deletions internal/services/cdn/deliveryruleactions/cache_key_query_string.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ func CacheKeyQueryString() *pluginsdk.Resource {
Type: pluginsdk.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{
string(cdn.Exclude),
string(cdn.ExcludeAll),
string(cdn.Include),
string(cdn.IncludeAll),
string(cdn.QueryStringBehaviorExclude),
string(cdn.QueryStringBehaviorExcludeAll),
string(cdn.QueryStringBehaviorInclude),
string(cdn.QueryStringBehaviorIncludeAll),
}, false),
},

Expand All @@ -38,15 +38,15 @@ func ExpandArmCdnEndpointActionCacheKeyQueryString(input []interface{}) (*[]cdn.
item := v.(map[string]interface{})

cacheKeyQueryStringAction := cdn.DeliveryRuleCacheKeyQueryStringAction{
Name: cdn.NameCacheKeyQueryString,
Name: cdn.NameBasicDeliveryRuleActionNameCacheKeyQueryString,
Parameters: &cdn.CacheKeyQueryStringActionParameters{
OdataType: utils.String("Microsoft.Azure.Cdn.Models.DeliveryRuleCacheKeyQueryStringBehaviorActionParameters"),
QueryStringBehavior: cdn.QueryStringBehavior(item["behavior"].(string)),
},
}

if parameters := item["parameters"].(string); parameters == "" {
if behavior := cacheKeyQueryStringAction.Parameters.QueryStringBehavior; behavior == cdn.Include || behavior == cdn.Exclude {
if behavior := cacheKeyQueryStringAction.Parameters.QueryStringBehavior; behavior == cdn.QueryStringBehaviorInclude || behavior == cdn.QueryStringBehaviorExclude {
return nil, fmt.Errorf("Parameters can not be empty if the behaviour is either Include or Exclude.")
}
} else {
Expand Down
8 changes: 4 additions & 4 deletions internal/services/cdn/deliveryruleactions/modify_request_header.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ func ModifyRequestHeader() *pluginsdk.Resource {
Type: pluginsdk.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{
string(cdn.Append),
string(cdn.Delete),
string(cdn.Overwrite),
string(cdn.HeaderActionAppend),
string(cdn.HeaderActionDelete),
string(cdn.HeaderActionOverwrite),
}, false),
},

Expand All @@ -42,7 +42,7 @@ func ExpandArmCdnEndpointActionModifyRequestHeader(input []interface{}) (*[]cdn.
item := v.(map[string]interface{})

requestHeaderAction := cdn.DeliveryRuleRequestHeaderAction{
Name: cdn.NameModifyRequestHeader,
Name: cdn.NameBasicDeliveryRuleActionNameModifyRequestHeader,
Parameters: &cdn.HeaderActionParameters{
OdataType: utils.String("Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters"),
HeaderAction: cdn.HeaderAction(item["action"].(string)),
Expand Down
8 changes: 4 additions & 4 deletions internal/services/cdn/deliveryruleactions/modify_response_header.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ func ModifyResponseHeader() *pluginsdk.Resource {
Type: pluginsdk.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{
string(cdn.Append),
string(cdn.Delete),
string(cdn.Overwrite),
string(cdn.HeaderActionAppend),
string(cdn.HeaderActionDelete),
string(cdn.HeaderActionOverwrite),
}, false),
},

Expand All @@ -42,7 +42,7 @@ func ExpandArmCdnEndpointActionModifyResponseHeader(input []interface{}) (*[]cdn
item := v.(map[string]interface{})

requestHeaderAction := cdn.DeliveryRuleResponseHeaderAction{
Name: cdn.NameModifyResponseHeader,
Name: cdn.NameBasicDeliveryRuleActionNameModifyResponseHeader,
Parameters: &cdn.HeaderActionParameters{
OdataType: utils.String("Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters"),
HeaderAction: cdn.HeaderAction(item["action"].(string)),
Expand Down
18 changes: 9 additions & 9 deletions internal/services/cdn/deliveryruleactions/url_redirect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@ func URLRedirect() *pluginsdk.Resource {
Type: pluginsdk.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{
string(cdn.Found),
string(cdn.Moved),
string(cdn.PermanentRedirect),
string(cdn.TemporaryRedirect),
string(cdn.RedirectTypeFound),
string(cdn.RedirectTypeMoved),
string(cdn.RedirectTypePermanentRedirect),
string(cdn.RedirectTypeTemporaryRedirect),
}, false),
},

"protocol": {
Type: pluginsdk.TypeString,
Optional: true,
Default: string(cdn.MatchRequest),
Default: string(cdn.DestinationProtocolMatchRequest),
ValidateFunc: validation.StringInSlice([]string{
string(cdn.MatchRequest),
string(cdn.HTTP),
string(cdn.HTTPS),
string(cdn.DestinationProtocolMatchRequest),
string(cdn.DestinationProtocolHTTP),
string(cdn.DestinationProtocolHTTPS),
}, false),
},

Expand Down Expand Up @@ -93,7 +93,7 @@ func ExpandArmCdnEndpointActionUrlRedirect(input []interface{}) (*[]cdn.BasicDel
}

output = append(output, cdn.URLRedirectAction{
Name: cdn.NameURLRedirect,
Name: cdn.NameBasicDeliveryRuleActionNameURLRedirect,
Parameters: &params,
})
}
Expand Down
2 changes: 1 addition & 1 deletion internal/services/cdn/deliveryruleactions/url_rewrite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func ExpandArmCdnEndpointActionURLRewrite(input []interface{}) (*[]cdn.BasicDeli
item := v.(map[string]interface{})

output = append(output, cdn.URLRewriteAction{
Name: cdn.NameURLRewrite,
Name: cdn.NameBasicDeliveryRuleActionNameURLRewrite,
Parameters: &cdn.URLRewriteActionParameters{
OdataType: utils.String("Microsoft.Azure.Cdn.Models.DeliveryRuleUrlRewriteActionParameters"),
SourcePattern: utils.String(item["source_pattern"].(string)),
Expand Down
22 changes: 11 additions & 11 deletions internal/services/cdn/deliveryruleconditions/cookies.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ func Cookies() *pluginsdk.Resource {
Type: pluginsdk.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{
string(cdn.Any),
string(cdn.BeginsWith),
string(cdn.Contains),
string(cdn.EndsWith),
string(cdn.Equal),
string(cdn.GreaterThan),
string(cdn.GreaterThanOrEqual),
string(cdn.LessThan),
string(cdn.LessThanOrEqual),
string(cdn.OperatorAny),
string(cdn.OperatorBeginsWith),
string(cdn.OperatorContains),
string(cdn.OperatorEndsWith),
string(cdn.OperatorEqual),
string(cdn.OperatorGreaterThan),
string(cdn.OperatorGreaterThanOrEqual),
string(cdn.OperatorLessThan),
string(cdn.OperatorLessThanOrEqual),
}, false),
},

Expand All @@ -56,8 +56,8 @@ func Cookies() *pluginsdk.Resource {
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringInSlice([]string{
string(cdn.Lowercase),
string(cdn.Uppercase),
string(cdn.TransformLowercase),
string(cdn.TransformUppercase),
}, false),
},
},
Expand Down
4 changes: 2 additions & 2 deletions internal/services/cdn/deliveryruleconditions/post_arg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ func PostArg() *pluginsdk.Resource {
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringInSlice([]string{
string(cdn.Lowercase),
string(cdn.Uppercase),
string(cdn.TransformLowercase),
string(cdn.TransformUppercase),
}, false),
},
},
Expand Down
4 changes: 2 additions & 2 deletions internal/services/cdn/deliveryruleconditions/query_string.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ func QueryString() *pluginsdk.Resource {
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringInSlice([]string{
string(cdn.Lowercase),
string(cdn.Uppercase),
string(cdn.TransformLowercase),
string(cdn.TransformUppercase),
}, false),
},
},
Expand Down
4 changes: 2 additions & 2 deletions internal/services/cdn/deliveryruleconditions/request_body.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ func RequestBody() *pluginsdk.Resource {
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringInSlice([]string{
string(cdn.Lowercase),
string(cdn.Uppercase),
string(cdn.TransformLowercase),
string(cdn.TransformUppercase),
}, false),
},
},
Expand Down
4 changes: 2 additions & 2 deletions internal/services/cdn/deliveryruleconditions/request_header.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ func RequestHeader() *pluginsdk.Resource {
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringInSlice([]string{
string(cdn.Lowercase),
string(cdn.Uppercase),
string(cdn.TransformLowercase),
string(cdn.TransformUppercase),
}, false),
},
},
Expand Down
4 changes: 2 additions & 2 deletions internal/services/cdn/deliveryruleconditions/request_uri.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ func RequestURI() *pluginsdk.Resource {
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringInSlice([]string{
string(cdn.Lowercase),
string(cdn.Uppercase),
string(cdn.TransformLowercase),
string(cdn.TransformUppercase),
}, false),
},
},
Expand Down
4 changes: 2 additions & 2 deletions internal/services/cdn/deliveryruleconditions/url_file_extension.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ func URLFileExtension() *pluginsdk.Resource {
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringInSlice([]string{
string(cdn.Lowercase),
string(cdn.Uppercase),
string(cdn.TransformLowercase),
string(cdn.TransformUppercase),
}, false),
},
},
Expand Down
4 changes: 2 additions & 2 deletions internal/services/cdn/deliveryruleconditions/url_file_name.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ func URLFileName() *pluginsdk.Resource {
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringInSlice([]string{
string(cdn.Lowercase),
string(cdn.Uppercase),
string(cdn.TransformLowercase),
string(cdn.TransformUppercase),
}, false),
},
},
Expand Down
4 changes: 2 additions & 2 deletions internal/services/cdn/deliveryruleconditions/url_path.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ func URLPath() *pluginsdk.Resource {
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringInSlice([]string{
string(cdn.Lowercase),
string(cdn.Uppercase),
string(cdn.TransformLowercase),
string(cdn.TransformUppercase),
}, false),
},
},
Expand Down
11 changes: 6 additions & 5 deletions internal/services/containers/container_registry_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,11 @@ func dataSourceContainerRegistry() *pluginsdk.Resource {
Computed: true,
},

// TODO 3.0 - remove this attribute
"storage_account_id": {
Type: pluginsdk.TypeString,
Computed: true,
Type: pluginsdk.TypeString,
Computed: true,
Deprecated: "this attribute is no longer recognized by the API and is not functional anymore, thus this property will be removed in v3.0",
},

"tags": tags.SchemaDataSource(),
Expand Down Expand Up @@ -97,9 +99,8 @@ func dataSourceContainerRegistryRead(d *pluginsdk.ResourceData, meta interface{}
d.Set("sku", string(sku.Tier))
}

if account := resp.StorageAccount; account != nil {
d.Set("storage_account_id", account.ID)
}
// Deprecated as it is not returned by the API now.
d.Set("storage_account_id", "")

if *resp.AdminUserEnabled {
credsResp, err := client.ListCredentials(ctx, resourceGroup, name)
Expand Down
Loading