From a4084ae4964089a325bf72216bdf1c4d42adfd31 Mon Sep 17 00:00:00 2001 From: magodo Date: Thu, 28 Oct 2021 18:02:04 +0800 Subject: [PATCH 1/4] update Azure Go SDK to v59.0.0 --- go.mod | 2 +- go.sum | 2 + .../services/cdn/cdn_endpoint_resource.go | 22 +- internal/services/cdn/cdn_profile_resource.go | 10 +- .../deliveryruleactions/cache_expiration.go | 10 +- .../cache_key_query_string.go | 12 +- .../modify_request_header.go | 8 +- .../modify_response_header.go | 8 +- .../cdn/deliveryruleactions/url_redirect.go | 18 +- .../cdn/deliveryruleactions/url_rewrite.go | 2 +- .../cdn/deliveryruleconditions/cookies.go | 22 +- .../cdn/deliveryruleconditions/post_arg.go | 4 +- .../deliveryruleconditions/query_string.go | 4 +- .../deliveryruleconditions/request_body.go | 4 +- .../deliveryruleconditions/request_header.go | 4 +- .../cdn/deliveryruleconditions/request_uri.go | 4 +- .../url_file_extension.go | 4 +- .../deliveryruleconditions/url_file_name.go | 4 +- .../cdn/deliveryruleconditions/url_path.go | 4 +- .../container_registry_data_source.go | 11 +- .../containers/container_registry_resource.go | 29 +- ..._integration_account_agreement_resource.go | 6 +- ...on_account_batch_configuration_resource.go | 28 +- .../cdn/mgmt/2020-09-01/cdn/CHANGELOG.md | 414 +++++++++ .../cdn/mgmt/2020-09-01/cdn/_meta.json | 6 +- .../cdn/mgmt/2020-09-01/cdn/customdomains.go | 62 +- .../services/cdn/mgmt/2020-09-01/cdn/enums.go | 813 +++++++++++------- .../cdn/mgmt/2020-09-01/cdn/loganalytics.go | 62 +- .../cdn/mgmt/2020-09-01/cdn/models.go | 705 +++++++++------ .../cdn/mgmt/2020-09-01/cdn/rulesets.go | 9 +- .../logic/mgmt/2019-05-01/logic/CHANGELOG.md | 190 ++++ .../logic/mgmt/2019-05-01/logic/_meta.json | 6 +- .../logic/mgmt/2019-05-01/logic/enums.go | 163 ++-- ...ntegrationserviceenvironmentmanagedapis.go | 35 +- .../logic/mgmt/2019-05-01/logic/models.go | 627 +++++++++----- .../postgresqlflexibleservers/_meta.json | 2 +- .../containerregistry/CHANGELOG.md | 25 + .../containerregistry/_meta.json | 2 +- .../containerregistry/models.go | 59 +- .../containerregistry/registries.go | 6 +- .../Azure/azure-sdk-for-go/version/version.go | 2 +- vendor/modules.txt | 2 +- .../docs/d/container_registry.html.markdown | 2 - .../docs/r/container_registry.html.markdown | 2 - 44 files changed, 2318 insertions(+), 1098 deletions(-) diff --git a/go.mod b/go.mod index 5c7c56e1ded4..a56b6ffd5733 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 13db17f12d7f..48d12e3632b3 100644 --- a/go.sum +++ b/go.sum @@ -47,6 +47,8 @@ github.com/Azure/azure-sdk-for-go v51.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9mo 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= diff --git a/internal/services/cdn/cdn_endpoint_resource.go b/internal/services/cdn/cdn_endpoint_resource.go index 48a98168e0d8..43a1083ca0bc 100644 --- a/internal/services/cdn/cdn_endpoint_resource.go +++ b/internal/services/cdn/cdn_endpoint_resource.go @@ -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, }, @@ -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, }, @@ -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 } } @@ -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 } } diff --git a/internal/services/cdn/cdn_profile_resource.go b/internal/services/cdn/cdn_profile_resource.go index 758b64077dc2..0c41fc10634d 100644 --- a/internal/services/cdn/cdn_profile_resource.go +++ b/internal/services/cdn/cdn_profile_resource.go @@ -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, }, diff --git a/internal/services/cdn/deliveryruleactions/cache_expiration.go b/internal/services/cdn/deliveryruleactions/cache_expiration.go index 6b71ce2dd51c..ffeebece03b9 100644 --- a/internal/services/cdn/deliveryruleactions/cache_expiration.go +++ b/internal/services/cdn/deliveryruleactions/cache_expiration.go @@ -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), }, @@ -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)), @@ -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`") } diff --git a/internal/services/cdn/deliveryruleactions/cache_key_query_string.go b/internal/services/cdn/deliveryruleactions/cache_key_query_string.go index cc4d7e74bb07..ff2393137040 100644 --- a/internal/services/cdn/deliveryruleactions/cache_key_query_string.go +++ b/internal/services/cdn/deliveryruleactions/cache_key_query_string.go @@ -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), }, @@ -38,7 +38,7 @@ 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)), @@ -46,7 +46,7 @@ func ExpandArmCdnEndpointActionCacheKeyQueryString(input []interface{}) (*[]cdn. } 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 { diff --git a/internal/services/cdn/deliveryruleactions/modify_request_header.go b/internal/services/cdn/deliveryruleactions/modify_request_header.go index e5fe29f8bdc9..1c86bbe087a6 100644 --- a/internal/services/cdn/deliveryruleactions/modify_request_header.go +++ b/internal/services/cdn/deliveryruleactions/modify_request_header.go @@ -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), }, @@ -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)), diff --git a/internal/services/cdn/deliveryruleactions/modify_response_header.go b/internal/services/cdn/deliveryruleactions/modify_response_header.go index 69c4025313ad..b092eba0eec0 100644 --- a/internal/services/cdn/deliveryruleactions/modify_response_header.go +++ b/internal/services/cdn/deliveryruleactions/modify_response_header.go @@ -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), }, @@ -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)), diff --git a/internal/services/cdn/deliveryruleactions/url_redirect.go b/internal/services/cdn/deliveryruleactions/url_redirect.go index 7e3eb09f1666..146200972d27 100644 --- a/internal/services/cdn/deliveryruleactions/url_redirect.go +++ b/internal/services/cdn/deliveryruleactions/url_redirect.go @@ -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), }, @@ -93,7 +93,7 @@ func ExpandArmCdnEndpointActionUrlRedirect(input []interface{}) (*[]cdn.BasicDel } output = append(output, cdn.URLRedirectAction{ - Name: cdn.NameURLRedirect, + Name: cdn.NameBasicDeliveryRuleActionNameURLRedirect, Parameters: ¶ms, }) } diff --git a/internal/services/cdn/deliveryruleactions/url_rewrite.go b/internal/services/cdn/deliveryruleactions/url_rewrite.go index 4ebca299d793..4cb2cd71116c 100644 --- a/internal/services/cdn/deliveryruleactions/url_rewrite.go +++ b/internal/services/cdn/deliveryruleactions/url_rewrite.go @@ -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)), diff --git a/internal/services/cdn/deliveryruleconditions/cookies.go b/internal/services/cdn/deliveryruleconditions/cookies.go index e141a3cd90d8..1d9232e4896a 100644 --- a/internal/services/cdn/deliveryruleconditions/cookies.go +++ b/internal/services/cdn/deliveryruleconditions/cookies.go @@ -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), }, @@ -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), }, }, diff --git a/internal/services/cdn/deliveryruleconditions/post_arg.go b/internal/services/cdn/deliveryruleconditions/post_arg.go index dec97efc77d7..3058e9e1e769 100644 --- a/internal/services/cdn/deliveryruleconditions/post_arg.go +++ b/internal/services/cdn/deliveryruleconditions/post_arg.go @@ -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), }, }, diff --git a/internal/services/cdn/deliveryruleconditions/query_string.go b/internal/services/cdn/deliveryruleconditions/query_string.go index 8e225a85e630..d203a0fb8634 100644 --- a/internal/services/cdn/deliveryruleconditions/query_string.go +++ b/internal/services/cdn/deliveryruleconditions/query_string.go @@ -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), }, }, diff --git a/internal/services/cdn/deliveryruleconditions/request_body.go b/internal/services/cdn/deliveryruleconditions/request_body.go index 4bf99259cc4f..27b1f9296abd 100644 --- a/internal/services/cdn/deliveryruleconditions/request_body.go +++ b/internal/services/cdn/deliveryruleconditions/request_body.go @@ -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), }, }, diff --git a/internal/services/cdn/deliveryruleconditions/request_header.go b/internal/services/cdn/deliveryruleconditions/request_header.go index 5332a68abbab..a8a74234998b 100644 --- a/internal/services/cdn/deliveryruleconditions/request_header.go +++ b/internal/services/cdn/deliveryruleconditions/request_header.go @@ -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), }, }, diff --git a/internal/services/cdn/deliveryruleconditions/request_uri.go b/internal/services/cdn/deliveryruleconditions/request_uri.go index c26ceb5fab18..dff82be951bf 100644 --- a/internal/services/cdn/deliveryruleconditions/request_uri.go +++ b/internal/services/cdn/deliveryruleconditions/request_uri.go @@ -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), }, }, diff --git a/internal/services/cdn/deliveryruleconditions/url_file_extension.go b/internal/services/cdn/deliveryruleconditions/url_file_extension.go index cde9fc89fef9..f28afd065da3 100644 --- a/internal/services/cdn/deliveryruleconditions/url_file_extension.go +++ b/internal/services/cdn/deliveryruleconditions/url_file_extension.go @@ -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), }, }, diff --git a/internal/services/cdn/deliveryruleconditions/url_file_name.go b/internal/services/cdn/deliveryruleconditions/url_file_name.go index 6e26832daba0..131257c7b5ee 100644 --- a/internal/services/cdn/deliveryruleconditions/url_file_name.go +++ b/internal/services/cdn/deliveryruleconditions/url_file_name.go @@ -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), }, }, diff --git a/internal/services/cdn/deliveryruleconditions/url_path.go b/internal/services/cdn/deliveryruleconditions/url_path.go index 3505de2063af..8b8e8e06981e 100644 --- a/internal/services/cdn/deliveryruleconditions/url_path.go +++ b/internal/services/cdn/deliveryruleconditions/url_path.go @@ -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), }, }, diff --git a/internal/services/containers/container_registry_data_source.go b/internal/services/containers/container_registry_data_source.go index 47ba3144d47e..76c876b3a165 100644 --- a/internal/services/containers/container_registry_data_source.go +++ b/internal/services/containers/container_registry_data_source.go @@ -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 not functional at all, will be removed in v3.0", }, "tags": tags.SchemaDataSource(), @@ -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) diff --git a/internal/services/containers/container_registry_resource.go b/internal/services/containers/container_registry_resource.go index 93a0f44b63f6..8badbac442a0 100644 --- a/internal/services/containers/container_registry_resource.go +++ b/internal/services/containers/container_registry_resource.go @@ -136,10 +136,13 @@ func resourceContainerRegistry() *pluginsdk.Resource { Default: true, }, + // TODO 3.0 - Remove this property as all the Classic sku instances are now deprecated and out of support at the serice side. "storage_account_id": { - Type: pluginsdk.TypeString, - Optional: true, - ForceNew: true, + Type: pluginsdk.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + Deprecated: "this property is not functional at all, will remove in v3.0", }, "login_server": { @@ -485,18 +488,6 @@ func resourceContainerRegistryCreate(d *pluginsdk.ResourceData, meta interface{} Tags: tags.Expand(t), } - if v, ok := d.GetOk("storage_account_id"); ok { - if !strings.EqualFold(sku, string(containerregistry.Classic)) { - return fmt.Errorf("`storage_account_id` can only be specified for a Classic (unmanaged) Sku.") - } - - parameters.StorageAccount = &containerregistry.StorageAccountProperties{ - ID: utils.String(v.(string)), - } - } else if strings.EqualFold(sku, string(containerregistry.Classic)) { - return fmt.Errorf("`storage_account_id` must be specified for a Classic (unmanaged) Sku.") - } - future, err := client.Create(ctx, resourceGroup, name, parameters) if err != nil { return fmt.Errorf("creating Container Registry %q (Resource Group %q): %+v", name, resourceGroup, err) @@ -782,10 +773,6 @@ func resourceContainerRegistryRead(d *pluginsdk.ResourceData, meta interface{}) d.Set("sku", string(sku.Tier)) } - if account := resp.StorageAccount; account != nil { - d.Set("storage_account_id", account.ID) - } - if *resp.AdminUserEnabled { credsResp, errList := client.ListCredentials(ctx, id.ResourceGroup, id.Name) if errList != nil { @@ -826,6 +813,10 @@ func resourceContainerRegistryRead(d *pluginsdk.ResourceData, meta interface{}) d.Set("georeplication_locations", geoReplicationLocations) d.Set("georeplications", geoReplications) + + // Deprecated as it is not returned by the API now. + d.Set("storage_account_id", "") + return tags.FlattenAndSet(d, resp.Tags) } diff --git a/internal/services/logic/logic_app_integration_account_agreement_resource.go b/internal/services/logic/logic_app_integration_account_agreement_resource.go index 2a436f588cb8..88ff92300b71 100644 --- a/internal/services/logic/logic_app_integration_account_agreement_resource.go +++ b/internal/services/logic/logic_app_integration_account_agreement_resource.go @@ -58,9 +58,9 @@ func resourceLogicAppIntegrationAccountAgreement() *pluginsdk.Resource { Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringInSlice([]string{ - string(logic.AS2), - string(logic.X12), - string(logic.Edifact), + string(logic.AgreementTypeAS2), + string(logic.AgreementTypeX12), + string(logic.AgreementTypeEdifact), }, false), }, diff --git a/internal/services/logic/logic_app_integration_account_batch_configuration_resource.go b/internal/services/logic/logic_app_integration_account_batch_configuration_resource.go index 1d68bd289ed2..35f7aaa7a83e 100644 --- a/internal/services/logic/logic_app_integration_account_batch_configuration_resource.go +++ b/internal/services/logic/logic_app_integration_account_batch_configuration_resource.go @@ -165,13 +165,13 @@ func resourceLogicAppIntegrationAccountBatchConfiguration() *pluginsdk.Resource Required: true, DiffSuppressFunc: suppress.CaseDifference, ValidateFunc: validation.StringInSlice([]string{ - string(logic.Monday), - string(logic.Tuesday), - string(logic.Wednesday), - string(logic.Thursday), - string(logic.Friday), - string(logic.Saturday), - string(logic.Sunday), + string(logic.DayOfWeekMonday), + string(logic.DayOfWeekTuesday), + string(logic.DayOfWeekWednesday), + string(logic.DayOfWeekThursday), + string(logic.DayOfWeekFriday), + string(logic.DayOfWeekSaturday), + string(logic.DayOfWeekSunday), }, true), }, @@ -195,13 +195,13 @@ func resourceLogicAppIntegrationAccountBatchConfiguration() *pluginsdk.Resource Elem: &pluginsdk.Schema{ Type: pluginsdk.TypeString, ValidateFunc: validation.StringInSlice([]string{ - string(logic.Monday), - string(logic.Tuesday), - string(logic.Wednesday), - string(logic.Thursday), - string(logic.Friday), - string(logic.Saturday), - string(logic.Sunday), + string(logic.DaysOfWeekMonday), + string(logic.DaysOfWeekTuesday), + string(logic.DaysOfWeekWednesday), + string(logic.DaysOfWeekThursday), + string(logic.DaysOfWeekFriday), + string(logic.DaysOfWeekSaturday), + string(logic.DaysOfWeekSunday), }, true), }, ConflictsWith: []string{"release_criteria.0.recurrence.0.schedule.0.month_days", "release_criteria.0.recurrence.0.schedule.0.monthly"}, diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/CHANGELOG.md b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/CHANGELOG.md index 52911e4cc5e4..2566c14286a5 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/CHANGELOG.md +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/CHANGELOG.md @@ -1,2 +1,416 @@ # Change History +## Breaking Changes + +### Removed Constants + +1. AFDEndpointProtocols.HTTP +1. AFDEndpointProtocols.HTTPS +1. ActionType.Allow +1. ActionType.Block +1. ActionType.Log +1. ActionType.Redirect +1. AfdMinimumTLSVersion.TLS10 +1. AfdMinimumTLSVersion.TLS12 +1. AfdProvisioningState.Creating +1. AfdProvisioningState.Deleting +1. AfdProvisioningState.Failed +1. AfdProvisioningState.Succeeded +1. AfdProvisioningState.Updating +1. AfdQueryStringCachingBehavior.IgnoreQueryString +1. AfdQueryStringCachingBehavior.NotSet +1. AfdQueryStringCachingBehavior.UseQueryString +1. Algorithm.SHA256 +1. CacheBehavior.BypassCache +1. CacheBehavior.Override +1. CacheBehavior.SetIfMissing +1. CertificateType.Dedicated +1. CertificateType.Shared +1. CookiesOperator.Any +1. CookiesOperator.BeginsWith +1. CookiesOperator.Contains +1. CookiesOperator.EndsWith +1. CookiesOperator.Equal +1. CookiesOperator.GreaterThan +1. CookiesOperator.GreaterThanOrEqual +1. CookiesOperator.LessThan +1. CookiesOperator.LessThanOrEqual +1. CookiesOperator.RegEx +1. CustomHTTPSProvisioningSubstate.CertificateDeleted +1. CustomHTTPSProvisioningSubstate.CertificateDeployed +1. CustomHTTPSProvisioningSubstate.DeletingCertificate +1. CustomHTTPSProvisioningSubstate.DeployingCertificate +1. CustomHTTPSProvisioningSubstate.DomainControlValidationRequestApproved +1. CustomHTTPSProvisioningSubstate.DomainControlValidationRequestRejected +1. CustomHTTPSProvisioningSubstate.DomainControlValidationRequestTimedOut +1. CustomHTTPSProvisioningSubstate.IssuingCertificate +1. CustomHTTPSProvisioningSubstate.PendingDomainControlValidationREquestApproval +1. CustomHTTPSProvisioningSubstate.SubmittingDomainControlValidationRequest +1. CustomRuleEnabledState.Disabled +1. CustomRuleEnabledState.Enabled +1. DomainValidationState.Approved +1. DomainValidationState.Pending +1. DomainValidationState.PendingRevalidation +1. DomainValidationState.Submitting +1. DomainValidationState.TimedOut +1. DomainValidationState.Unknown +1. ForwardingProtocol.HTTPOnly +1. ForwardingProtocol.HTTPSOnly +1. ForwardingProtocol.MatchRequest +1. Granularity.P1D +1. Granularity.PT1H +1. Granularity.PT5M +1. HeaderAction.Append +1. HeaderAction.Delete +1. HeaderAction.Overwrite +1. IdentityType.Application +1. IdentityType.Key +1. IdentityType.ManagedIdentity +1. IdentityType.User +1. MatchProcessingBehavior.Continue +1. MatchProcessingBehavior.Stop +1. MatchVariable.Cookies +1. MatchVariable.PostArgs +1. MatchVariable.QueryString +1. MatchVariable.RemoteAddr +1. MatchVariable.RequestBody +1. MatchVariable.RequestHeader +1. MatchVariable.RequestMethod +1. MatchVariable.RequestURI +1. MatchVariable.SocketAddr +1. NameBasicDeliveryRuleAction.NameCacheExpiration +1. NameBasicDeliveryRuleAction.NameCacheKeyQueryString +1. NameBasicDeliveryRuleAction.NameDeliveryRuleAction +1. NameBasicDeliveryRuleAction.NameModifyRequestHeader +1. NameBasicDeliveryRuleAction.NameModifyResponseHeader +1. NameBasicDeliveryRuleAction.NameOriginGroupOverride +1. NameBasicDeliveryRuleAction.NameURLRedirect +1. NameBasicDeliveryRuleAction.NameURLRewrite +1. NameBasicDeliveryRuleAction.NameURLSigning +1. OptimizationType.DynamicSiteAcceleration +1. OptimizationType.GeneralMediaStreaming +1. OptimizationType.GeneralWebDelivery +1. OptimizationType.LargeFileDownload +1. OptimizationType.VideoOnDemandMediaStreaming +1. ParamIndicator.Expires +1. ParamIndicator.KeyID +1. ParamIndicator.Signature +1. PolicyMode.Detection +1. PolicyMode.Prevention +1. ProtocolType.IPBased +1. ProtocolType.ServerNameIndication +1. QueryStringBehavior.Exclude +1. QueryStringBehavior.ExcludeAll +1. QueryStringBehavior.Include +1. QueryStringBehavior.IncludeAll +1. RedirectType.Found +1. RedirectType.Moved +1. RedirectType.PermanentRedirect +1. RedirectType.TemporaryRedirect +1. ResourceType.MicrosoftCdnProfilesEndpoints +1. ResponseBasedDetectedErrorTypes.None +1. ResponseBasedDetectedErrorTypes.TCPAndHTTPErrors +1. ResponseBasedDetectedErrorTypes.TCPErrorsOnly +1. SkuName.CustomVerizon +1. SkuName.PremiumAzureFrontDoor +1. SkuName.PremiumChinaCdn +1. SkuName.PremiumVerizon +1. SkuName.Standard955BandWidthChinaCdn +1. SkuName.StandardAkamai +1. SkuName.StandardAvgBandWidthChinaCdn +1. SkuName.StandardAzureFrontDoor +1. SkuName.StandardChinaCdn +1. SkuName.StandardMicrosoft +1. SkuName.StandardPlus955BandWidthChinaCdn +1. SkuName.StandardPlusAvgBandWidthChinaCdn +1. SkuName.StandardPlusChinaCdn +1. SkuName.StandardVerizon +1. Status.AccessDenied +1. Status.CertificateExpired +1. Status.Invalid +1. Status.Valid +1. Transform.Lowercase +1. Transform.Uppercase +1. TypeBasicSecretParameters.TypeCustomerCertificate +1. TypeBasicSecretParameters.TypeManagedCertificate +1. TypeBasicSecretParameters.TypeSecretParameters +1. TypeBasicSecretParameters.TypeURLSigningKey +1. Unit.BitsPerSecond +1. Unit.Bytes +1. Unit.Count + +### Signature Changes + +#### Funcs + +1. CustomDomainsClient.DisableCustomHTTPS + - Returns + - From: CustomDomain, error + - To: CustomDomainsDisableCustomHTTPSFuture, error +1. CustomDomainsClient.DisableCustomHTTPSSender + - Returns + - From: *http.Response, error + - To: CustomDomainsDisableCustomHTTPSFuture, error +1. CustomDomainsClient.EnableCustomHTTPS + - Returns + - From: CustomDomain, error + - To: CustomDomainsEnableCustomHTTPSFuture, error +1. CustomDomainsClient.EnableCustomHTTPSSender + - Returns + - From: *http.Response, error + - To: CustomDomainsEnableCustomHTTPSFuture, error +1. LogAnalyticsClient.GetLogAnalyticsMetrics + - Params + - From: context.Context, string, string, []string, date.Time, date.Time, string, []string, []string, []string, []string, []string + - To: context.Context, string, string, []LogMetric, date.Time, date.Time, LogMetricsGranularity, []string, []string, []LogMetricsGroupBy, []string, []string +1. LogAnalyticsClient.GetLogAnalyticsMetricsPreparer + - Params + - From: context.Context, string, string, []string, date.Time, date.Time, string, []string, []string, []string, []string, []string + - To: context.Context, string, string, []LogMetric, date.Time, date.Time, LogMetricsGranularity, []string, []string, []LogMetricsGroupBy, []string, []string +1. LogAnalyticsClient.GetLogAnalyticsRankings + - Params + - From: context.Context, string, string, []string, []string, int32, date.Time, date.Time, []string + - To: context.Context, string, string, []LogRanking, []LogRankingMetric, int32, date.Time, date.Time, []string +1. LogAnalyticsClient.GetLogAnalyticsRankingsPreparer + - Params + - From: context.Context, string, string, []string, []string, int32, date.Time, date.Time, []string + - To: context.Context, string, string, []LogRanking, []LogRankingMetric, int32, date.Time, date.Time, []string +1. LogAnalyticsClient.GetWafLogAnalyticsMetrics + - Params + - From: context.Context, string, string, []string, date.Time, date.Time, string, []string, []string, []string + - To: context.Context, string, string, []WafMetric, date.Time, date.Time, WafGranularity, []WafAction, []WafRankingGroupBy, []WafRuleType +1. LogAnalyticsClient.GetWafLogAnalyticsMetricsPreparer + - Params + - From: context.Context, string, string, []string, date.Time, date.Time, string, []string, []string, []string + - To: context.Context, string, string, []WafMetric, date.Time, date.Time, WafGranularity, []WafAction, []WafRankingGroupBy, []WafRuleType +1. LogAnalyticsClient.GetWafLogAnalyticsRankings + - Params + - From: context.Context, string, string, []string, date.Time, date.Time, int32, []string, []string, []string + - To: context.Context, string, string, []WafMetric, date.Time, date.Time, int32, []WafRankingType, []WafAction, []WafRuleType +1. LogAnalyticsClient.GetWafLogAnalyticsRankingsPreparer + - Params + - From: context.Context, string, string, []string, date.Time, date.Time, int32, []string, []string, []string + - To: context.Context, string, string, []WafMetric, date.Time, date.Time, int32, []WafRankingType, []WafAction, []WafRuleType +1. RuleSetsClient.Create + - Params + - From: context.Context, string, string, string, RuleSet + - To: context.Context, string, string, string +1. RuleSetsClient.CreatePreparer + - Params + - From: context.Context, string, string, string, RuleSet + - To: context.Context, string, string, string + +## Additive Changes + +### New Constants + +1. AFDEndpointProtocols.AFDEndpointProtocolsHTTP +1. AFDEndpointProtocols.AFDEndpointProtocolsHTTPS +1. ActionType.ActionTypeAllow +1. ActionType.ActionTypeBlock +1. ActionType.ActionTypeLog +1. ActionType.ActionTypeRedirect +1. AfdMinimumTLSVersion.AfdMinimumTLSVersionTLS10 +1. AfdMinimumTLSVersion.AfdMinimumTLSVersionTLS12 +1. AfdProvisioningState.AfdProvisioningStateCreating +1. AfdProvisioningState.AfdProvisioningStateDeleting +1. AfdProvisioningState.AfdProvisioningStateFailed +1. AfdProvisioningState.AfdProvisioningStateSucceeded +1. AfdProvisioningState.AfdProvisioningStateUpdating +1. AfdQueryStringCachingBehavior.AfdQueryStringCachingBehaviorIgnoreQueryString +1. AfdQueryStringCachingBehavior.AfdQueryStringCachingBehaviorNotSet +1. AfdQueryStringCachingBehavior.AfdQueryStringCachingBehaviorUseQueryString +1. Algorithm.AlgorithmSHA256 +1. CacheBehavior.CacheBehaviorBypassCache +1. CacheBehavior.CacheBehaviorOverride +1. CacheBehavior.CacheBehaviorSetIfMissing +1. CertificateType.CertificateTypeDedicated +1. CertificateType.CertificateTypeShared +1. CookiesOperator.CookiesOperatorAny +1. CookiesOperator.CookiesOperatorBeginsWith +1. CookiesOperator.CookiesOperatorContains +1. CookiesOperator.CookiesOperatorEndsWith +1. CookiesOperator.CookiesOperatorEqual +1. CookiesOperator.CookiesOperatorGreaterThan +1. CookiesOperator.CookiesOperatorGreaterThanOrEqual +1. CookiesOperator.CookiesOperatorLessThan +1. CookiesOperator.CookiesOperatorLessThanOrEqual +1. CookiesOperator.CookiesOperatorRegEx +1. CustomHTTPSProvisioningSubstate.CustomHTTPSProvisioningSubstateCertificateDeleted +1. CustomHTTPSProvisioningSubstate.CustomHTTPSProvisioningSubstateCertificateDeployed +1. CustomHTTPSProvisioningSubstate.CustomHTTPSProvisioningSubstateDeletingCertificate +1. CustomHTTPSProvisioningSubstate.CustomHTTPSProvisioningSubstateDeployingCertificate +1. CustomHTTPSProvisioningSubstate.CustomHTTPSProvisioningSubstateDomainControlValidationRequestApproved +1. CustomHTTPSProvisioningSubstate.CustomHTTPSProvisioningSubstateDomainControlValidationRequestRejected +1. CustomHTTPSProvisioningSubstate.CustomHTTPSProvisioningSubstateDomainControlValidationRequestTimedOut +1. CustomHTTPSProvisioningSubstate.CustomHTTPSProvisioningSubstateIssuingCertificate +1. CustomHTTPSProvisioningSubstate.CustomHTTPSProvisioningSubstatePendingDomainControlValidationREquestApproval +1. CustomHTTPSProvisioningSubstate.CustomHTTPSProvisioningSubstateSubmittingDomainControlValidationRequest +1. CustomRuleEnabledState.CustomRuleEnabledStateDisabled +1. CustomRuleEnabledState.CustomRuleEnabledStateEnabled +1. DomainValidationState.DomainValidationStateApproved +1. DomainValidationState.DomainValidationStatePending +1. DomainValidationState.DomainValidationStatePendingRevalidation +1. DomainValidationState.DomainValidationStateSubmitting +1. DomainValidationState.DomainValidationStateTimedOut +1. DomainValidationState.DomainValidationStateUnknown +1. ForwardingProtocol.ForwardingProtocolHTTPOnly +1. ForwardingProtocol.ForwardingProtocolHTTPSOnly +1. ForwardingProtocol.ForwardingProtocolMatchRequest +1. Granularity.GranularityP1D +1. Granularity.GranularityPT1H +1. Granularity.GranularityPT5M +1. HeaderAction.HeaderActionAppend +1. HeaderAction.HeaderActionDelete +1. HeaderAction.HeaderActionOverwrite +1. IdentityType.IdentityTypeApplication +1. IdentityType.IdentityTypeKey +1. IdentityType.IdentityTypeManagedIdentity +1. IdentityType.IdentityTypeUser +1. LogMetric.LogMetricClientRequestBandwidth +1. LogMetric.LogMetricClientRequestCount +1. LogMetric.LogMetricClientRequestTraffic +1. LogMetric.LogMetricOriginRequestBandwidth +1. LogMetric.LogMetricOriginRequestTraffic +1. LogMetric.LogMetricTotalLatency +1. LogMetricsGranularity.LogMetricsGranularityP1D +1. LogMetricsGranularity.LogMetricsGranularityPT1H +1. LogMetricsGranularity.LogMetricsGranularityPT5M +1. LogMetricsGroupBy.LogMetricsGroupByCacheStatus +1. LogMetricsGroupBy.LogMetricsGroupByCountry +1. LogMetricsGroupBy.LogMetricsGroupByCustomDomain +1. LogMetricsGroupBy.LogMetricsGroupByHTTPStatusCode +1. LogMetricsGroupBy.LogMetricsGroupByProtocol +1. LogRanking.LogRankingBrowser +1. LogRanking.LogRankingCountryOrRegion +1. LogRanking.LogRankingReferrer +1. LogRanking.LogRankingURL +1. LogRanking.LogRankingUserAgent +1. LogRankingMetric.LogRankingMetricClientRequestCount +1. LogRankingMetric.LogRankingMetricClientRequestTraffic +1. LogRankingMetric.LogRankingMetricErrorCount +1. LogRankingMetric.LogRankingMetricHitCount +1. LogRankingMetric.LogRankingMetricMissCount +1. LogRankingMetric.LogRankingMetricUserErrorCount +1. MatchProcessingBehavior.MatchProcessingBehaviorContinue +1. MatchProcessingBehavior.MatchProcessingBehaviorStop +1. MatchVariable.MatchVariableCookies +1. MatchVariable.MatchVariablePostArgs +1. MatchVariable.MatchVariableQueryString +1. MatchVariable.MatchVariableRemoteAddr +1. MatchVariable.MatchVariableRequestBody +1. MatchVariable.MatchVariableRequestHeader +1. MatchVariable.MatchVariableRequestMethod +1. MatchVariable.MatchVariableRequestURI +1. MatchVariable.MatchVariableSocketAddr +1. NameBasicDeliveryRuleAction.NameBasicDeliveryRuleActionNameCacheExpiration +1. NameBasicDeliveryRuleAction.NameBasicDeliveryRuleActionNameCacheKeyQueryString +1. NameBasicDeliveryRuleAction.NameBasicDeliveryRuleActionNameDeliveryRuleAction +1. NameBasicDeliveryRuleAction.NameBasicDeliveryRuleActionNameModifyRequestHeader +1. NameBasicDeliveryRuleAction.NameBasicDeliveryRuleActionNameModifyResponseHeader +1. NameBasicDeliveryRuleAction.NameBasicDeliveryRuleActionNameOriginGroupOverride +1. NameBasicDeliveryRuleAction.NameBasicDeliveryRuleActionNameURLRedirect +1. NameBasicDeliveryRuleAction.NameBasicDeliveryRuleActionNameURLRewrite +1. NameBasicDeliveryRuleAction.NameBasicDeliveryRuleActionNameURLSigning +1. OptimizationType.OptimizationTypeDynamicSiteAcceleration +1. OptimizationType.OptimizationTypeGeneralMediaStreaming +1. OptimizationType.OptimizationTypeGeneralWebDelivery +1. OptimizationType.OptimizationTypeLargeFileDownload +1. OptimizationType.OptimizationTypeVideoOnDemandMediaStreaming +1. ParamIndicator.ParamIndicatorExpires +1. ParamIndicator.ParamIndicatorKeyID +1. ParamIndicator.ParamIndicatorSignature +1. PolicyMode.PolicyModeDetection +1. PolicyMode.PolicyModePrevention +1. ProtocolType.ProtocolTypeIPBased +1. ProtocolType.ProtocolTypeServerNameIndication +1. QueryStringBehavior.QueryStringBehaviorExclude +1. QueryStringBehavior.QueryStringBehaviorExcludeAll +1. QueryStringBehavior.QueryStringBehaviorInclude +1. QueryStringBehavior.QueryStringBehaviorIncludeAll +1. RedirectType.RedirectTypeFound +1. RedirectType.RedirectTypeMoved +1. RedirectType.RedirectTypePermanentRedirect +1. RedirectType.RedirectTypeTemporaryRedirect +1. ResourceType.ResourceTypeMicrosoftCdnProfilesEndpoints +1. ResponseBasedDetectedErrorTypes.ResponseBasedDetectedErrorTypesNone +1. ResponseBasedDetectedErrorTypes.ResponseBasedDetectedErrorTypesTCPAndHTTPErrors +1. ResponseBasedDetectedErrorTypes.ResponseBasedDetectedErrorTypesTCPErrorsOnly +1. SkuName.SkuNameCustomVerizon +1. SkuName.SkuNamePremiumAzureFrontDoor +1. SkuName.SkuNamePremiumChinaCdn +1. SkuName.SkuNamePremiumVerizon +1. SkuName.SkuNameStandard955BandWidthChinaCdn +1. SkuName.SkuNameStandardAkamai +1. SkuName.SkuNameStandardAvgBandWidthChinaCdn +1. SkuName.SkuNameStandardAzureFrontDoor +1. SkuName.SkuNameStandardChinaCdn +1. SkuName.SkuNameStandardMicrosoft +1. SkuName.SkuNameStandardPlus955BandWidthChinaCdn +1. SkuName.SkuNameStandardPlusAvgBandWidthChinaCdn +1. SkuName.SkuNameStandardPlusChinaCdn +1. SkuName.SkuNameStandardVerizon +1. Status.StatusAccessDenied +1. Status.StatusCertificateExpired +1. Status.StatusInvalid +1. Status.StatusValid +1. Transform.TransformLowercase +1. Transform.TransformUppercase +1. TypeBasicSecretParameters.TypeBasicSecretParametersTypeCustomerCertificate +1. TypeBasicSecretParameters.TypeBasicSecretParametersTypeManagedCertificate +1. TypeBasicSecretParameters.TypeBasicSecretParametersTypeSecretParameters +1. TypeBasicSecretParameters.TypeBasicSecretParametersTypeURLSigningKey +1. Unit.UnitBitsPerSecond +1. Unit.UnitBytes +1. Unit.UnitCount +1. WafAction.WafActionAllow +1. WafAction.WafActionBlock +1. WafAction.WafActionLog +1. WafAction.WafActionRedirect +1. WafGranularity.WafGranularityP1D +1. WafGranularity.WafGranularityPT1H +1. WafGranularity.WafGranularityPT5M +1. WafMetric.WafMetricClientRequestCount +1. WafRankingGroupBy.WafRankingGroupByCustomDomain +1. WafRankingGroupBy.WafRankingGroupByHTTPStatusCode +1. WafRankingType.WafRankingTypeAction +1. WafRankingType.WafRankingTypeClientIP +1. WafRankingType.WafRankingTypeCountry +1. WafRankingType.WafRankingTypeRuleGroup +1. WafRankingType.WafRankingTypeRuleID +1. WafRankingType.WafRankingTypeRuleType +1. WafRankingType.WafRankingTypeURL +1. WafRankingType.WafRankingTypeUserAgent +1. WafRuleType.WafRuleTypeBot +1. WafRuleType.WafRuleTypeCustom +1. WafRuleType.WafRuleTypeManaged + +### New Funcs + +1. *CustomDomainProperties.UnmarshalJSON([]byte) error +1. *CustomDomainsDisableCustomHTTPSFuture.UnmarshalJSON([]byte) error +1. *CustomDomainsEnableCustomHTTPSFuture.UnmarshalJSON([]byte) error +1. PossibleLogMetricValues() []LogMetric +1. PossibleLogMetricsGranularityValues() []LogMetricsGranularity +1. PossibleLogMetricsGroupByValues() []LogMetricsGroupBy +1. PossibleLogRankingMetricValues() []LogRankingMetric +1. PossibleLogRankingValues() []LogRanking +1. PossibleWafActionValues() []WafAction +1. PossibleWafGranularityValues() []WafGranularity +1. PossibleWafMetricValues() []WafMetric +1. PossibleWafRankingGroupByValues() []WafRankingGroupBy +1. PossibleWafRankingTypeValues() []WafRankingType +1. PossibleWafRuleTypeValues() []WafRuleType + +### Struct Changes + +#### New Structs + +1. CustomDomainsDisableCustomHTTPSFuture +1. CustomDomainsEnableCustomHTTPSFuture + +#### New Struct Fields + +1. CustomDomainProperties.CustomHTTPSParameters +1. ManagedRuleSetDefinition.SystemData +1. Resource.SystemData diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/_meta.json b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/_meta.json index 44c23ef6967d..bdabbf013f4e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/_meta.json +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/_meta.json @@ -1,11 +1,11 @@ { - "commit": "138759b8a5987252fd66658078907e1d93969c85", + "commit": "2b56c8a3da0e04aea6f6d80a9ac04741d1ae5904", "readme": "/_/azure-rest-api-specs/specification/cdn/resource-manager/readme.md", "tag": "package-2020-09", "use": "@microsoft.azure/autorest.go@2.1.187", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "autorest_command": "autorest --use=@microsoft.azure/autorest.go@2.1.187 --tag=package-2020-09 --go-sdk-folder=/_/azure-sdk-for-go --go --verbose --use-onever --version=V2 --go.license-header=MICROSOFT_MIT_NO_VERSION /_/azure-rest-api-specs/specification/cdn/resource-manager/readme.md", + "autorest_command": "autorest --use=@microsoft.azure/autorest.go@2.1.187 --tag=package-2020-09 --go-sdk-folder=/_/azure-sdk-for-go --go --verbose --use-onever --version=V2 --go.license-header=MICROSOFT_MIT_NO_VERSION --enum-prefix /_/azure-rest-api-specs/specification/cdn/resource-manager/readme.md", "additional_properties": { - "additional_options": "--go --verbose --use-onever --version=V2 --go.license-header=MICROSOFT_MIT_NO_VERSION" + "additional_options": "--go --verbose --use-onever --version=V2 --go.license-header=MICROSOFT_MIT_NO_VERSION --enum-prefix" } } \ No newline at end of file diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/customdomains.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/customdomains.go index d824bdae8b36..6c67f88d6487 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/customdomains.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/customdomains.go @@ -225,13 +225,13 @@ func (client CustomDomainsClient) DeleteResponder(resp *http.Response) (result C // profileName - name of the CDN profile which is unique within the resource group. // endpointName - name of the endpoint under the profile which is unique globally. // customDomainName - name of the custom domain within an endpoint. -func (client CustomDomainsClient) DisableCustomHTTPS(ctx context.Context, resourceGroupName string, profileName string, endpointName string, customDomainName string) (result CustomDomain, err error) { +func (client CustomDomainsClient) DisableCustomHTTPS(ctx context.Context, resourceGroupName string, profileName string, endpointName string, customDomainName string) (result CustomDomainsDisableCustomHTTPSFuture, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/CustomDomainsClient.DisableCustomHTTPS") defer func() { sc := -1 - if result.Response.Response != nil { - sc = result.Response.Response.StatusCode + if result.FutureAPI != nil && result.FutureAPI.Response() != nil { + sc = result.FutureAPI.Response().StatusCode } tracing.EndSpan(ctx, sc, err) }() @@ -250,16 +250,9 @@ func (client CustomDomainsClient) DisableCustomHTTPS(ctx context.Context, resour return } - resp, err := client.DisableCustomHTTPSSender(req) + result, err = client.DisableCustomHTTPSSender(req) if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "cdn.CustomDomainsClient", "DisableCustomHTTPS", resp, "Failure sending request") - return - } - - result, err = client.DisableCustomHTTPSResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.CustomDomainsClient", "DisableCustomHTTPS", resp, "Failure responding to request") + err = autorest.NewErrorWithError(err, "cdn.CustomDomainsClient", "DisableCustomHTTPS", result.Response(), "Failure sending request") return } @@ -291,8 +284,18 @@ func (client CustomDomainsClient) DisableCustomHTTPSPreparer(ctx context.Context // DisableCustomHTTPSSender sends the DisableCustomHTTPS request. The method will close the // http.Response Body if it receives an error. -func (client CustomDomainsClient) DisableCustomHTTPSSender(req *http.Request) (*http.Response, error) { - return client.Send(req, azure.DoRetryWithRegistration(client.Client)) +func (client CustomDomainsClient) DisableCustomHTTPSSender(req *http.Request) (future CustomDomainsDisableCustomHTTPSFuture, err error) { + var resp *http.Response + future.FutureAPI = &azure.Future{} + resp, err = client.Send(req, azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + var azf azure.Future + azf, err = azure.NewFutureFromResponse(resp) + future.FutureAPI = &azf + future.Result = future.result + return } // DisableCustomHTTPSResponder handles the response to the DisableCustomHTTPS request. The method always @@ -316,13 +319,13 @@ func (client CustomDomainsClient) DisableCustomHTTPSResponder(resp *http.Respons // customDomainHTTPSParameters - the configuration specifying how to enable HTTPS for the custom domain - using // CDN managed certificate or user's own certificate. If not specified, enabling ssl uses CDN managed // certificate by default. -func (client CustomDomainsClient) EnableCustomHTTPS(ctx context.Context, resourceGroupName string, profileName string, endpointName string, customDomainName string, customDomainHTTPSParameters *BasicCustomDomainHTTPSParameters) (result CustomDomain, err error) { +func (client CustomDomainsClient) EnableCustomHTTPS(ctx context.Context, resourceGroupName string, profileName string, endpointName string, customDomainName string, customDomainHTTPSParameters *BasicCustomDomainHTTPSParameters) (result CustomDomainsEnableCustomHTTPSFuture, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/CustomDomainsClient.EnableCustomHTTPS") defer func() { sc := -1 - if result.Response.Response != nil { - sc = result.Response.Response.StatusCode + if result.FutureAPI != nil && result.FutureAPI.Response() != nil { + sc = result.FutureAPI.Response().StatusCode } tracing.EndSpan(ctx, sc, err) }() @@ -341,16 +344,9 @@ func (client CustomDomainsClient) EnableCustomHTTPS(ctx context.Context, resourc return } - resp, err := client.EnableCustomHTTPSSender(req) + result, err = client.EnableCustomHTTPSSender(req) if err != nil { - result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "cdn.CustomDomainsClient", "EnableCustomHTTPS", resp, "Failure sending request") - return - } - - result, err = client.EnableCustomHTTPSResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "cdn.CustomDomainsClient", "EnableCustomHTTPS", resp, "Failure responding to request") + err = autorest.NewErrorWithError(err, "cdn.CustomDomainsClient", "EnableCustomHTTPS", result.Response(), "Failure sending request") return } @@ -387,8 +383,18 @@ func (client CustomDomainsClient) EnableCustomHTTPSPreparer(ctx context.Context, // EnableCustomHTTPSSender sends the EnableCustomHTTPS request. The method will close the // http.Response Body if it receives an error. -func (client CustomDomainsClient) EnableCustomHTTPSSender(req *http.Request) (*http.Response, error) { - return client.Send(req, azure.DoRetryWithRegistration(client.Client)) +func (client CustomDomainsClient) EnableCustomHTTPSSender(req *http.Request) (future CustomDomainsEnableCustomHTTPSFuture, err error) { + var resp *http.Response + future.FutureAPI = &azure.Future{} + resp, err = client.Send(req, azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + var azf azure.Future + azf, err = azure.NewFutureFromResponse(resp) + future.FutureAPI = &azf + future.Result = future.result + return } // EnableCustomHTTPSResponder handles the response to the EnableCustomHTTPS request. The method always diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/enums.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/enums.go index ef64d3abb8fe..f4de58dfdcea 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/enums.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/enums.go @@ -10,19 +10,19 @@ package cdn type ActionType string const ( - // Allow ... - Allow ActionType = "Allow" - // Block ... - Block ActionType = "Block" - // Log ... - Log ActionType = "Log" - // Redirect ... - Redirect ActionType = "Redirect" + // ActionTypeAllow ... + ActionTypeAllow ActionType = "Allow" + // ActionTypeBlock ... + ActionTypeBlock ActionType = "Block" + // ActionTypeLog ... + ActionTypeLog ActionType = "Log" + // ActionTypeRedirect ... + ActionTypeRedirect ActionType = "Redirect" ) // PossibleActionTypeValues returns an array of possible values for the ActionType const type. func PossibleActionTypeValues() []ActionType { - return []ActionType{Allow, Block, Log, Redirect} + return []ActionType{ActionTypeAllow, ActionTypeBlock, ActionTypeLog, ActionTypeRedirect} } // AfdCertificateType enumerates the values for afd certificate type. @@ -44,98 +44,98 @@ func PossibleAfdCertificateTypeValues() []AfdCertificateType { type AFDEndpointProtocols string const ( - // HTTP ... - HTTP AFDEndpointProtocols = "Http" - // HTTPS ... - HTTPS AFDEndpointProtocols = "Https" + // AFDEndpointProtocolsHTTP ... + AFDEndpointProtocolsHTTP AFDEndpointProtocols = "Http" + // AFDEndpointProtocolsHTTPS ... + AFDEndpointProtocolsHTTPS AFDEndpointProtocols = "Https" ) // PossibleAFDEndpointProtocolsValues returns an array of possible values for the AFDEndpointProtocols const type. func PossibleAFDEndpointProtocolsValues() []AFDEndpointProtocols { - return []AFDEndpointProtocols{HTTP, HTTPS} + return []AFDEndpointProtocols{AFDEndpointProtocolsHTTP, AFDEndpointProtocolsHTTPS} } // AfdMinimumTLSVersion enumerates the values for afd minimum tls version. type AfdMinimumTLSVersion string const ( - // TLS10 ... - TLS10 AfdMinimumTLSVersion = "TLS10" - // TLS12 ... - TLS12 AfdMinimumTLSVersion = "TLS12" + // AfdMinimumTLSVersionTLS10 ... + AfdMinimumTLSVersionTLS10 AfdMinimumTLSVersion = "TLS10" + // AfdMinimumTLSVersionTLS12 ... + AfdMinimumTLSVersionTLS12 AfdMinimumTLSVersion = "TLS12" ) // PossibleAfdMinimumTLSVersionValues returns an array of possible values for the AfdMinimumTLSVersion const type. func PossibleAfdMinimumTLSVersionValues() []AfdMinimumTLSVersion { - return []AfdMinimumTLSVersion{TLS10, TLS12} + return []AfdMinimumTLSVersion{AfdMinimumTLSVersionTLS10, AfdMinimumTLSVersionTLS12} } // AfdProvisioningState enumerates the values for afd provisioning state. type AfdProvisioningState string const ( - // Creating ... - Creating AfdProvisioningState = "Creating" - // Deleting ... - Deleting AfdProvisioningState = "Deleting" - // Failed ... - Failed AfdProvisioningState = "Failed" - // Succeeded ... - Succeeded AfdProvisioningState = "Succeeded" - // Updating ... - Updating AfdProvisioningState = "Updating" + // AfdProvisioningStateCreating ... + AfdProvisioningStateCreating AfdProvisioningState = "Creating" + // AfdProvisioningStateDeleting ... + AfdProvisioningStateDeleting AfdProvisioningState = "Deleting" + // AfdProvisioningStateFailed ... + AfdProvisioningStateFailed AfdProvisioningState = "Failed" + // AfdProvisioningStateSucceeded ... + AfdProvisioningStateSucceeded AfdProvisioningState = "Succeeded" + // AfdProvisioningStateUpdating ... + AfdProvisioningStateUpdating AfdProvisioningState = "Updating" ) // PossibleAfdProvisioningStateValues returns an array of possible values for the AfdProvisioningState const type. func PossibleAfdProvisioningStateValues() []AfdProvisioningState { - return []AfdProvisioningState{Creating, Deleting, Failed, Succeeded, Updating} + return []AfdProvisioningState{AfdProvisioningStateCreating, AfdProvisioningStateDeleting, AfdProvisioningStateFailed, AfdProvisioningStateSucceeded, AfdProvisioningStateUpdating} } // AfdQueryStringCachingBehavior enumerates the values for afd query string caching behavior. type AfdQueryStringCachingBehavior string const ( - // IgnoreQueryString ... - IgnoreQueryString AfdQueryStringCachingBehavior = "IgnoreQueryString" - // NotSet ... - NotSet AfdQueryStringCachingBehavior = "NotSet" - // UseQueryString ... - UseQueryString AfdQueryStringCachingBehavior = "UseQueryString" + // AfdQueryStringCachingBehaviorIgnoreQueryString ... + AfdQueryStringCachingBehaviorIgnoreQueryString AfdQueryStringCachingBehavior = "IgnoreQueryString" + // AfdQueryStringCachingBehaviorNotSet ... + AfdQueryStringCachingBehaviorNotSet AfdQueryStringCachingBehavior = "NotSet" + // AfdQueryStringCachingBehaviorUseQueryString ... + AfdQueryStringCachingBehaviorUseQueryString AfdQueryStringCachingBehavior = "UseQueryString" ) // PossibleAfdQueryStringCachingBehaviorValues returns an array of possible values for the AfdQueryStringCachingBehavior const type. func PossibleAfdQueryStringCachingBehaviorValues() []AfdQueryStringCachingBehavior { - return []AfdQueryStringCachingBehavior{IgnoreQueryString, NotSet, UseQueryString} + return []AfdQueryStringCachingBehavior{AfdQueryStringCachingBehaviorIgnoreQueryString, AfdQueryStringCachingBehaviorNotSet, AfdQueryStringCachingBehaviorUseQueryString} } // Algorithm enumerates the values for algorithm. type Algorithm string const ( - // SHA256 ... - SHA256 Algorithm = "SHA256" + // AlgorithmSHA256 ... + AlgorithmSHA256 Algorithm = "SHA256" ) // PossibleAlgorithmValues returns an array of possible values for the Algorithm const type. func PossibleAlgorithmValues() []Algorithm { - return []Algorithm{SHA256} + return []Algorithm{AlgorithmSHA256} } // CacheBehavior enumerates the values for cache behavior. type CacheBehavior string const ( - // BypassCache ... - BypassCache CacheBehavior = "BypassCache" - // Override ... - Override CacheBehavior = "Override" - // SetIfMissing ... - SetIfMissing CacheBehavior = "SetIfMissing" + // CacheBehaviorBypassCache ... + CacheBehaviorBypassCache CacheBehavior = "BypassCache" + // CacheBehaviorOverride ... + CacheBehaviorOverride CacheBehavior = "Override" + // CacheBehaviorSetIfMissing ... + CacheBehaviorSetIfMissing CacheBehavior = "SetIfMissing" ) // PossibleCacheBehaviorValues returns an array of possible values for the CacheBehavior const type. func PossibleCacheBehaviorValues() []CacheBehavior { - return []CacheBehavior{BypassCache, Override, SetIfMissing} + return []CacheBehavior{CacheBehaviorBypassCache, CacheBehaviorOverride, CacheBehaviorSetIfMissing} } // CertificateSource enumerates the values for certificate source. @@ -159,46 +159,46 @@ func PossibleCertificateSourceValues() []CertificateSource { type CertificateType string const ( - // Dedicated ... - Dedicated CertificateType = "Dedicated" - // Shared ... - Shared CertificateType = "Shared" + // CertificateTypeDedicated ... + CertificateTypeDedicated CertificateType = "Dedicated" + // CertificateTypeShared ... + CertificateTypeShared CertificateType = "Shared" ) // PossibleCertificateTypeValues returns an array of possible values for the CertificateType const type. func PossibleCertificateTypeValues() []CertificateType { - return []CertificateType{Dedicated, Shared} + return []CertificateType{CertificateTypeDedicated, CertificateTypeShared} } // CookiesOperator enumerates the values for cookies operator. type CookiesOperator string const ( - // Any ... - Any CookiesOperator = "Any" - // BeginsWith ... - BeginsWith CookiesOperator = "BeginsWith" - // Contains ... - Contains CookiesOperator = "Contains" - // EndsWith ... - EndsWith CookiesOperator = "EndsWith" - // Equal ... - Equal CookiesOperator = "Equal" - // GreaterThan ... - GreaterThan CookiesOperator = "GreaterThan" - // GreaterThanOrEqual ... - GreaterThanOrEqual CookiesOperator = "GreaterThanOrEqual" - // LessThan ... - LessThan CookiesOperator = "LessThan" - // LessThanOrEqual ... - LessThanOrEqual CookiesOperator = "LessThanOrEqual" - // RegEx ... - RegEx CookiesOperator = "RegEx" + // CookiesOperatorAny ... + CookiesOperatorAny CookiesOperator = "Any" + // CookiesOperatorBeginsWith ... + CookiesOperatorBeginsWith CookiesOperator = "BeginsWith" + // CookiesOperatorContains ... + CookiesOperatorContains CookiesOperator = "Contains" + // CookiesOperatorEndsWith ... + CookiesOperatorEndsWith CookiesOperator = "EndsWith" + // CookiesOperatorEqual ... + CookiesOperatorEqual CookiesOperator = "Equal" + // CookiesOperatorGreaterThan ... + CookiesOperatorGreaterThan CookiesOperator = "GreaterThan" + // CookiesOperatorGreaterThanOrEqual ... + CookiesOperatorGreaterThanOrEqual CookiesOperator = "GreaterThanOrEqual" + // CookiesOperatorLessThan ... + CookiesOperatorLessThan CookiesOperator = "LessThan" + // CookiesOperatorLessThanOrEqual ... + CookiesOperatorLessThanOrEqual CookiesOperator = "LessThanOrEqual" + // CookiesOperatorRegEx ... + CookiesOperatorRegEx CookiesOperator = "RegEx" ) // PossibleCookiesOperatorValues returns an array of possible values for the CookiesOperator const type. func PossibleCookiesOperatorValues() []CookiesOperator { - return []CookiesOperator{Any, BeginsWith, Contains, EndsWith, Equal, GreaterThan, GreaterThanOrEqual, LessThan, LessThanOrEqual, RegEx} + return []CookiesOperator{CookiesOperatorAny, CookiesOperatorBeginsWith, CookiesOperatorContains, CookiesOperatorEndsWith, CookiesOperatorEqual, CookiesOperatorGreaterThan, CookiesOperatorGreaterThanOrEqual, CookiesOperatorLessThan, CookiesOperatorLessThanOrEqual, CookiesOperatorRegEx} } // CustomDomainResourceState enumerates the values for custom domain resource state. @@ -243,46 +243,46 @@ func PossibleCustomHTTPSProvisioningStateValues() []CustomHTTPSProvisioningState type CustomHTTPSProvisioningSubstate string const ( - // CertificateDeleted ... - CertificateDeleted CustomHTTPSProvisioningSubstate = "CertificateDeleted" - // CertificateDeployed ... - CertificateDeployed CustomHTTPSProvisioningSubstate = "CertificateDeployed" - // DeletingCertificate ... - DeletingCertificate CustomHTTPSProvisioningSubstate = "DeletingCertificate" - // DeployingCertificate ... - DeployingCertificate CustomHTTPSProvisioningSubstate = "DeployingCertificate" - // DomainControlValidationRequestApproved ... - DomainControlValidationRequestApproved CustomHTTPSProvisioningSubstate = "DomainControlValidationRequestApproved" - // DomainControlValidationRequestRejected ... - DomainControlValidationRequestRejected CustomHTTPSProvisioningSubstate = "DomainControlValidationRequestRejected" - // DomainControlValidationRequestTimedOut ... - DomainControlValidationRequestTimedOut CustomHTTPSProvisioningSubstate = "DomainControlValidationRequestTimedOut" - // IssuingCertificate ... - IssuingCertificate CustomHTTPSProvisioningSubstate = "IssuingCertificate" - // PendingDomainControlValidationREquestApproval ... - PendingDomainControlValidationREquestApproval CustomHTTPSProvisioningSubstate = "PendingDomainControlValidationREquestApproval" - // SubmittingDomainControlValidationRequest ... - SubmittingDomainControlValidationRequest CustomHTTPSProvisioningSubstate = "SubmittingDomainControlValidationRequest" + // CustomHTTPSProvisioningSubstateCertificateDeleted ... + CustomHTTPSProvisioningSubstateCertificateDeleted CustomHTTPSProvisioningSubstate = "CertificateDeleted" + // CustomHTTPSProvisioningSubstateCertificateDeployed ... + CustomHTTPSProvisioningSubstateCertificateDeployed CustomHTTPSProvisioningSubstate = "CertificateDeployed" + // CustomHTTPSProvisioningSubstateDeletingCertificate ... + CustomHTTPSProvisioningSubstateDeletingCertificate CustomHTTPSProvisioningSubstate = "DeletingCertificate" + // CustomHTTPSProvisioningSubstateDeployingCertificate ... + CustomHTTPSProvisioningSubstateDeployingCertificate CustomHTTPSProvisioningSubstate = "DeployingCertificate" + // CustomHTTPSProvisioningSubstateDomainControlValidationRequestApproved ... + CustomHTTPSProvisioningSubstateDomainControlValidationRequestApproved CustomHTTPSProvisioningSubstate = "DomainControlValidationRequestApproved" + // CustomHTTPSProvisioningSubstateDomainControlValidationRequestRejected ... + CustomHTTPSProvisioningSubstateDomainControlValidationRequestRejected CustomHTTPSProvisioningSubstate = "DomainControlValidationRequestRejected" + // CustomHTTPSProvisioningSubstateDomainControlValidationRequestTimedOut ... + CustomHTTPSProvisioningSubstateDomainControlValidationRequestTimedOut CustomHTTPSProvisioningSubstate = "DomainControlValidationRequestTimedOut" + // CustomHTTPSProvisioningSubstateIssuingCertificate ... + CustomHTTPSProvisioningSubstateIssuingCertificate CustomHTTPSProvisioningSubstate = "IssuingCertificate" + // CustomHTTPSProvisioningSubstatePendingDomainControlValidationREquestApproval ... + CustomHTTPSProvisioningSubstatePendingDomainControlValidationREquestApproval CustomHTTPSProvisioningSubstate = "PendingDomainControlValidationREquestApproval" + // CustomHTTPSProvisioningSubstateSubmittingDomainControlValidationRequest ... + CustomHTTPSProvisioningSubstateSubmittingDomainControlValidationRequest CustomHTTPSProvisioningSubstate = "SubmittingDomainControlValidationRequest" ) // PossibleCustomHTTPSProvisioningSubstateValues returns an array of possible values for the CustomHTTPSProvisioningSubstate const type. func PossibleCustomHTTPSProvisioningSubstateValues() []CustomHTTPSProvisioningSubstate { - return []CustomHTTPSProvisioningSubstate{CertificateDeleted, CertificateDeployed, DeletingCertificate, DeployingCertificate, DomainControlValidationRequestApproved, DomainControlValidationRequestRejected, DomainControlValidationRequestTimedOut, IssuingCertificate, PendingDomainControlValidationREquestApproval, SubmittingDomainControlValidationRequest} + return []CustomHTTPSProvisioningSubstate{CustomHTTPSProvisioningSubstateCertificateDeleted, CustomHTTPSProvisioningSubstateCertificateDeployed, CustomHTTPSProvisioningSubstateDeletingCertificate, CustomHTTPSProvisioningSubstateDeployingCertificate, CustomHTTPSProvisioningSubstateDomainControlValidationRequestApproved, CustomHTTPSProvisioningSubstateDomainControlValidationRequestRejected, CustomHTTPSProvisioningSubstateDomainControlValidationRequestTimedOut, CustomHTTPSProvisioningSubstateIssuingCertificate, CustomHTTPSProvisioningSubstatePendingDomainControlValidationREquestApproval, CustomHTTPSProvisioningSubstateSubmittingDomainControlValidationRequest} } // CustomRuleEnabledState enumerates the values for custom rule enabled state. type CustomRuleEnabledState string const ( - // Disabled ... - Disabled CustomRuleEnabledState = "Disabled" - // Enabled ... - Enabled CustomRuleEnabledState = "Enabled" + // CustomRuleEnabledStateDisabled ... + CustomRuleEnabledStateDisabled CustomRuleEnabledState = "Disabled" + // CustomRuleEnabledStateEnabled ... + CustomRuleEnabledStateEnabled CustomRuleEnabledState = "Enabled" ) // PossibleCustomRuleEnabledStateValues returns an array of possible values for the CustomRuleEnabledState const type. func PossibleCustomRuleEnabledStateValues() []CustomRuleEnabledState { - return []CustomRuleEnabledState{Disabled, Enabled} + return []CustomRuleEnabledState{CustomRuleEnabledStateDisabled, CustomRuleEnabledStateEnabled} } // DeploymentStatus enumerates the values for deployment status. @@ -325,23 +325,23 @@ func PossibleDestinationProtocolValues() []DestinationProtocol { type DomainValidationState string const ( - // Approved ... - Approved DomainValidationState = "Approved" - // Pending ... - Pending DomainValidationState = "Pending" - // PendingRevalidation ... - PendingRevalidation DomainValidationState = "PendingRevalidation" - // Submitting ... - Submitting DomainValidationState = "Submitting" - // TimedOut ... - TimedOut DomainValidationState = "TimedOut" - // Unknown ... - Unknown DomainValidationState = "Unknown" + // DomainValidationStateApproved ... + DomainValidationStateApproved DomainValidationState = "Approved" + // DomainValidationStatePending ... + DomainValidationStatePending DomainValidationState = "Pending" + // DomainValidationStatePendingRevalidation ... + DomainValidationStatePendingRevalidation DomainValidationState = "PendingRevalidation" + // DomainValidationStateSubmitting ... + DomainValidationStateSubmitting DomainValidationState = "Submitting" + // DomainValidationStateTimedOut ... + DomainValidationStateTimedOut DomainValidationState = "TimedOut" + // DomainValidationStateUnknown ... + DomainValidationStateUnknown DomainValidationState = "Unknown" ) // PossibleDomainValidationStateValues returns an array of possible values for the DomainValidationState const type. func PossibleDomainValidationStateValues() []DomainValidationState { - return []DomainValidationState{Approved, Pending, PendingRevalidation, Submitting, TimedOut, Unknown} + return []DomainValidationState{DomainValidationStateApproved, DomainValidationStatePending, DomainValidationStatePendingRevalidation, DomainValidationStateSubmitting, DomainValidationStateTimedOut, DomainValidationStateUnknown} } // EnabledState enumerates the values for enabled state. @@ -386,17 +386,17 @@ func PossibleEndpointResourceStateValues() []EndpointResourceState { type ForwardingProtocol string const ( - // HTTPOnly ... - HTTPOnly ForwardingProtocol = "HttpOnly" - // HTTPSOnly ... - HTTPSOnly ForwardingProtocol = "HttpsOnly" - // MatchRequest ... - MatchRequest ForwardingProtocol = "MatchRequest" + // ForwardingProtocolHTTPOnly ... + ForwardingProtocolHTTPOnly ForwardingProtocol = "HttpOnly" + // ForwardingProtocolHTTPSOnly ... + ForwardingProtocolHTTPSOnly ForwardingProtocol = "HttpsOnly" + // ForwardingProtocolMatchRequest ... + ForwardingProtocolMatchRequest ForwardingProtocol = "MatchRequest" ) // PossibleForwardingProtocolValues returns an array of possible values for the ForwardingProtocol const type. func PossibleForwardingProtocolValues() []ForwardingProtocol { - return []ForwardingProtocol{HTTPOnly, HTTPSOnly, MatchRequest} + return []ForwardingProtocol{ForwardingProtocolHTTPOnly, ForwardingProtocolHTTPSOnly, ForwardingProtocolMatchRequest} } // GeoFilterActions enumerates the values for geo filter actions. @@ -418,17 +418,17 @@ func PossibleGeoFilterActionsValues() []GeoFilterActions { type Granularity string const ( - // P1D ... - P1D Granularity = "P1D" - // PT1H ... - PT1H Granularity = "PT1H" - // PT5M ... - PT5M Granularity = "PT5M" + // GranularityP1D ... + GranularityP1D Granularity = "P1D" + // GranularityPT1H ... + GranularityPT1H Granularity = "PT1H" + // GranularityPT5M ... + GranularityPT5M Granularity = "PT5M" ) // PossibleGranularityValues returns an array of possible values for the Granularity const type. func PossibleGranularityValues() []Granularity { - return []Granularity{P1D, PT1H, PT5M} + return []Granularity{GranularityP1D, GranularityPT1H, GranularityPT5M} } // Granularity1 enumerates the values for granularity 1. @@ -452,17 +452,17 @@ func PossibleGranularity1Values() []Granularity1 { type HeaderAction string const ( - // Append ... - Append HeaderAction = "Append" - // Delete ... - Delete HeaderAction = "Delete" - // Overwrite ... - Overwrite HeaderAction = "Overwrite" + // HeaderActionAppend ... + HeaderActionAppend HeaderAction = "Append" + // HeaderActionDelete ... + HeaderActionDelete HeaderAction = "Delete" + // HeaderActionOverwrite ... + HeaderActionOverwrite HeaderAction = "Overwrite" ) // PossibleHeaderActionValues returns an array of possible values for the HeaderAction const type. func PossibleHeaderActionValues() []HeaderAction { - return []HeaderAction{Append, Delete, Overwrite} + return []HeaderAction{HeaderActionAppend, HeaderActionDelete, HeaderActionOverwrite} } // HealthProbeRequestType enumerates the values for health probe request type. @@ -501,19 +501,19 @@ func PossibleHTTPSRedirectValues() []HTTPSRedirect { type IdentityType string const ( - // Application ... - Application IdentityType = "application" - // Key ... - Key IdentityType = "key" - // ManagedIdentity ... - ManagedIdentity IdentityType = "managedIdentity" - // User ... - User IdentityType = "user" + // IdentityTypeApplication ... + IdentityTypeApplication IdentityType = "application" + // IdentityTypeKey ... + IdentityTypeKey IdentityType = "key" + // IdentityTypeManagedIdentity ... + IdentityTypeManagedIdentity IdentityType = "managedIdentity" + // IdentityTypeUser ... + IdentityTypeUser IdentityType = "user" ) // PossibleIdentityTypeValues returns an array of possible values for the IdentityType const type. func PossibleIdentityTypeValues() []IdentityType { - return []IdentityType{Application, Key, ManagedIdentity, User} + return []IdentityType{IdentityTypeApplication, IdentityTypeKey, IdentityTypeManagedIdentity, IdentityTypeUser} } // LinkToDefaultDomain enumerates the values for link to default domain. @@ -531,6 +531,111 @@ func PossibleLinkToDefaultDomainValues() []LinkToDefaultDomain { return []LinkToDefaultDomain{LinkToDefaultDomainDisabled, LinkToDefaultDomainEnabled} } +// LogMetric enumerates the values for log metric. +type LogMetric string + +const ( + // LogMetricClientRequestBandwidth ... + LogMetricClientRequestBandwidth LogMetric = "clientRequestBandwidth" + // LogMetricClientRequestCount ... + LogMetricClientRequestCount LogMetric = "clientRequestCount" + // LogMetricClientRequestTraffic ... + LogMetricClientRequestTraffic LogMetric = "clientRequestTraffic" + // LogMetricOriginRequestBandwidth ... + LogMetricOriginRequestBandwidth LogMetric = "originRequestBandwidth" + // LogMetricOriginRequestTraffic ... + LogMetricOriginRequestTraffic LogMetric = "originRequestTraffic" + // LogMetricTotalLatency ... + LogMetricTotalLatency LogMetric = "totalLatency" +) + +// PossibleLogMetricValues returns an array of possible values for the LogMetric const type. +func PossibleLogMetricValues() []LogMetric { + return []LogMetric{LogMetricClientRequestBandwidth, LogMetricClientRequestCount, LogMetricClientRequestTraffic, LogMetricOriginRequestBandwidth, LogMetricOriginRequestTraffic, LogMetricTotalLatency} +} + +// LogMetricsGranularity enumerates the values for log metrics granularity. +type LogMetricsGranularity string + +const ( + // LogMetricsGranularityP1D ... + LogMetricsGranularityP1D LogMetricsGranularity = "P1D" + // LogMetricsGranularityPT1H ... + LogMetricsGranularityPT1H LogMetricsGranularity = "PT1H" + // LogMetricsGranularityPT5M ... + LogMetricsGranularityPT5M LogMetricsGranularity = "PT5M" +) + +// PossibleLogMetricsGranularityValues returns an array of possible values for the LogMetricsGranularity const type. +func PossibleLogMetricsGranularityValues() []LogMetricsGranularity { + return []LogMetricsGranularity{LogMetricsGranularityP1D, LogMetricsGranularityPT1H, LogMetricsGranularityPT5M} +} + +// LogMetricsGroupBy enumerates the values for log metrics group by. +type LogMetricsGroupBy string + +const ( + // LogMetricsGroupByCacheStatus ... + LogMetricsGroupByCacheStatus LogMetricsGroupBy = "cacheStatus" + // LogMetricsGroupByCountry ... + LogMetricsGroupByCountry LogMetricsGroupBy = "country" + // LogMetricsGroupByCustomDomain ... + LogMetricsGroupByCustomDomain LogMetricsGroupBy = "customDomain" + // LogMetricsGroupByHTTPStatusCode ... + LogMetricsGroupByHTTPStatusCode LogMetricsGroupBy = "httpStatusCode" + // LogMetricsGroupByProtocol ... + LogMetricsGroupByProtocol LogMetricsGroupBy = "protocol" +) + +// PossibleLogMetricsGroupByValues returns an array of possible values for the LogMetricsGroupBy const type. +func PossibleLogMetricsGroupByValues() []LogMetricsGroupBy { + return []LogMetricsGroupBy{LogMetricsGroupByCacheStatus, LogMetricsGroupByCountry, LogMetricsGroupByCustomDomain, LogMetricsGroupByHTTPStatusCode, LogMetricsGroupByProtocol} +} + +// LogRanking enumerates the values for log ranking. +type LogRanking string + +const ( + // LogRankingBrowser ... + LogRankingBrowser LogRanking = "browser" + // LogRankingCountryOrRegion ... + LogRankingCountryOrRegion LogRanking = "countryOrRegion" + // LogRankingReferrer ... + LogRankingReferrer LogRanking = "referrer" + // LogRankingURL ... + LogRankingURL LogRanking = "url" + // LogRankingUserAgent ... + LogRankingUserAgent LogRanking = "userAgent" +) + +// PossibleLogRankingValues returns an array of possible values for the LogRanking const type. +func PossibleLogRankingValues() []LogRanking { + return []LogRanking{LogRankingBrowser, LogRankingCountryOrRegion, LogRankingReferrer, LogRankingURL, LogRankingUserAgent} +} + +// LogRankingMetric enumerates the values for log ranking metric. +type LogRankingMetric string + +const ( + // LogRankingMetricClientRequestCount ... + LogRankingMetricClientRequestCount LogRankingMetric = "clientRequestCount" + // LogRankingMetricClientRequestTraffic ... + LogRankingMetricClientRequestTraffic LogRankingMetric = "clientRequestTraffic" + // LogRankingMetricErrorCount ... + LogRankingMetricErrorCount LogRankingMetric = "errorCount" + // LogRankingMetricHitCount ... + LogRankingMetricHitCount LogRankingMetric = "hitCount" + // LogRankingMetricMissCount ... + LogRankingMetricMissCount LogRankingMetric = "missCount" + // LogRankingMetricUserErrorCount ... + LogRankingMetricUserErrorCount LogRankingMetric = "userErrorCount" +) + +// PossibleLogRankingMetricValues returns an array of possible values for the LogRankingMetric const type. +func PossibleLogRankingMetricValues() []LogRankingMetric { + return []LogRankingMetric{LogRankingMetricClientRequestCount, LogRankingMetricClientRequestTraffic, LogRankingMetricErrorCount, LogRankingMetricHitCount, LogRankingMetricMissCount, LogRankingMetricUserErrorCount} +} + // ManagedRuleEnabledState enumerates the values for managed rule enabled state. type ManagedRuleEnabledState string @@ -550,44 +655,44 @@ func PossibleManagedRuleEnabledStateValues() []ManagedRuleEnabledState { type MatchProcessingBehavior string const ( - // Continue ... - Continue MatchProcessingBehavior = "Continue" - // Stop ... - Stop MatchProcessingBehavior = "Stop" + // MatchProcessingBehaviorContinue ... + MatchProcessingBehaviorContinue MatchProcessingBehavior = "Continue" + // MatchProcessingBehaviorStop ... + MatchProcessingBehaviorStop MatchProcessingBehavior = "Stop" ) // PossibleMatchProcessingBehaviorValues returns an array of possible values for the MatchProcessingBehavior const type. func PossibleMatchProcessingBehaviorValues() []MatchProcessingBehavior { - return []MatchProcessingBehavior{Continue, Stop} + return []MatchProcessingBehavior{MatchProcessingBehaviorContinue, MatchProcessingBehaviorStop} } // MatchVariable enumerates the values for match variable. type MatchVariable string const ( - // Cookies ... - Cookies MatchVariable = "Cookies" - // PostArgs ... - PostArgs MatchVariable = "PostArgs" - // QueryString ... - QueryString MatchVariable = "QueryString" - // RemoteAddr ... - RemoteAddr MatchVariable = "RemoteAddr" - // RequestBody ... - RequestBody MatchVariable = "RequestBody" - // RequestHeader ... - RequestHeader MatchVariable = "RequestHeader" - // RequestMethod ... - RequestMethod MatchVariable = "RequestMethod" - // RequestURI ... - RequestURI MatchVariable = "RequestUri" - // SocketAddr ... - SocketAddr MatchVariable = "SocketAddr" + // MatchVariableCookies ... + MatchVariableCookies MatchVariable = "Cookies" + // MatchVariablePostArgs ... + MatchVariablePostArgs MatchVariable = "PostArgs" + // MatchVariableQueryString ... + MatchVariableQueryString MatchVariable = "QueryString" + // MatchVariableRemoteAddr ... + MatchVariableRemoteAddr MatchVariable = "RemoteAddr" + // MatchVariableRequestBody ... + MatchVariableRequestBody MatchVariable = "RequestBody" + // MatchVariableRequestHeader ... + MatchVariableRequestHeader MatchVariable = "RequestHeader" + // MatchVariableRequestMethod ... + MatchVariableRequestMethod MatchVariable = "RequestMethod" + // MatchVariableRequestURI ... + MatchVariableRequestURI MatchVariable = "RequestUri" + // MatchVariableSocketAddr ... + MatchVariableSocketAddr MatchVariable = "SocketAddr" ) // PossibleMatchVariableValues returns an array of possible values for the MatchVariable const type. func PossibleMatchVariableValues() []MatchVariable { - return []MatchVariable{Cookies, PostArgs, QueryString, RemoteAddr, RequestBody, RequestHeader, RequestMethod, RequestURI, SocketAddr} + return []MatchVariable{MatchVariableCookies, MatchVariablePostArgs, MatchVariableQueryString, MatchVariableRemoteAddr, MatchVariableRequestBody, MatchVariableRequestHeader, MatchVariableRequestMethod, MatchVariableRequestURI, MatchVariableSocketAddr} } // MinimumTLSVersion enumerates the values for minimum tls version. @@ -652,29 +757,29 @@ func PossibleNameValues() []Name { type NameBasicDeliveryRuleAction string const ( - // NameCacheExpiration ... - NameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" - // NameCacheKeyQueryString ... - NameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" - // NameDeliveryRuleAction ... - NameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" - // NameModifyRequestHeader ... - NameModifyRequestHeader NameBasicDeliveryRuleAction = "ModifyRequestHeader" - // NameModifyResponseHeader ... - NameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" - // NameOriginGroupOverride ... - NameOriginGroupOverride NameBasicDeliveryRuleAction = "OriginGroupOverride" - // NameURLRedirect ... - NameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" - // NameURLRewrite ... - NameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" - // NameURLSigning ... - NameURLSigning NameBasicDeliveryRuleAction = "UrlSigning" + // NameBasicDeliveryRuleActionNameCacheExpiration ... + NameBasicDeliveryRuleActionNameCacheExpiration NameBasicDeliveryRuleAction = "CacheExpiration" + // NameBasicDeliveryRuleActionNameCacheKeyQueryString ... + NameBasicDeliveryRuleActionNameCacheKeyQueryString NameBasicDeliveryRuleAction = "CacheKeyQueryString" + // NameBasicDeliveryRuleActionNameDeliveryRuleAction ... + NameBasicDeliveryRuleActionNameDeliveryRuleAction NameBasicDeliveryRuleAction = "DeliveryRuleAction" + // NameBasicDeliveryRuleActionNameModifyRequestHeader ... + NameBasicDeliveryRuleActionNameModifyRequestHeader NameBasicDeliveryRuleAction = "ModifyRequestHeader" + // NameBasicDeliveryRuleActionNameModifyResponseHeader ... + NameBasicDeliveryRuleActionNameModifyResponseHeader NameBasicDeliveryRuleAction = "ModifyResponseHeader" + // NameBasicDeliveryRuleActionNameOriginGroupOverride ... + NameBasicDeliveryRuleActionNameOriginGroupOverride NameBasicDeliveryRuleAction = "OriginGroupOverride" + // NameBasicDeliveryRuleActionNameURLRedirect ... + NameBasicDeliveryRuleActionNameURLRedirect NameBasicDeliveryRuleAction = "UrlRedirect" + // NameBasicDeliveryRuleActionNameURLRewrite ... + NameBasicDeliveryRuleActionNameURLRewrite NameBasicDeliveryRuleAction = "UrlRewrite" + // NameBasicDeliveryRuleActionNameURLSigning ... + NameBasicDeliveryRuleActionNameURLSigning NameBasicDeliveryRuleAction = "UrlSigning" ) // PossibleNameBasicDeliveryRuleActionValues returns an array of possible values for the NameBasicDeliveryRuleAction const type. func PossibleNameBasicDeliveryRuleActionValues() []NameBasicDeliveryRuleAction { - return []NameBasicDeliveryRuleAction{NameCacheExpiration, NameCacheKeyQueryString, NameDeliveryRuleAction, NameModifyRequestHeader, NameModifyResponseHeader, NameOriginGroupOverride, NameURLRedirect, NameURLRewrite, NameURLSigning} + return []NameBasicDeliveryRuleAction{NameBasicDeliveryRuleActionNameCacheExpiration, NameBasicDeliveryRuleActionNameCacheKeyQueryString, NameBasicDeliveryRuleActionNameDeliveryRuleAction, NameBasicDeliveryRuleActionNameModifyRequestHeader, NameBasicDeliveryRuleActionNameModifyResponseHeader, NameBasicDeliveryRuleActionNameOriginGroupOverride, NameBasicDeliveryRuleActionNameURLRedirect, NameBasicDeliveryRuleActionNameURLRewrite, NameBasicDeliveryRuleActionNameURLSigning} } // Operator enumerates the values for operator. @@ -716,21 +821,21 @@ func PossibleOperatorValues() []Operator { type OptimizationType string const ( - // DynamicSiteAcceleration ... - DynamicSiteAcceleration OptimizationType = "DynamicSiteAcceleration" - // GeneralMediaStreaming ... - GeneralMediaStreaming OptimizationType = "GeneralMediaStreaming" - // GeneralWebDelivery ... - GeneralWebDelivery OptimizationType = "GeneralWebDelivery" - // LargeFileDownload ... - LargeFileDownload OptimizationType = "LargeFileDownload" - // VideoOnDemandMediaStreaming ... - VideoOnDemandMediaStreaming OptimizationType = "VideoOnDemandMediaStreaming" + // OptimizationTypeDynamicSiteAcceleration ... + OptimizationTypeDynamicSiteAcceleration OptimizationType = "DynamicSiteAcceleration" + // OptimizationTypeGeneralMediaStreaming ... + OptimizationTypeGeneralMediaStreaming OptimizationType = "GeneralMediaStreaming" + // OptimizationTypeGeneralWebDelivery ... + OptimizationTypeGeneralWebDelivery OptimizationType = "GeneralWebDelivery" + // OptimizationTypeLargeFileDownload ... + OptimizationTypeLargeFileDownload OptimizationType = "LargeFileDownload" + // OptimizationTypeVideoOnDemandMediaStreaming ... + OptimizationTypeVideoOnDemandMediaStreaming OptimizationType = "VideoOnDemandMediaStreaming" ) // PossibleOptimizationTypeValues returns an array of possible values for the OptimizationType const type. func PossibleOptimizationTypeValues() []OptimizationType { - return []OptimizationType{DynamicSiteAcceleration, GeneralMediaStreaming, GeneralWebDelivery, LargeFileDownload, VideoOnDemandMediaStreaming} + return []OptimizationType{OptimizationTypeDynamicSiteAcceleration, OptimizationTypeGeneralMediaStreaming, OptimizationTypeGeneralWebDelivery, OptimizationTypeLargeFileDownload, OptimizationTypeVideoOnDemandMediaStreaming} } // OriginGroupResourceState enumerates the values for origin group resource state. @@ -771,17 +876,17 @@ func PossibleOriginResourceStateValues() []OriginResourceState { type ParamIndicator string const ( - // Expires ... - Expires ParamIndicator = "Expires" - // KeyID ... - KeyID ParamIndicator = "KeyId" - // Signature ... - Signature ParamIndicator = "Signature" + // ParamIndicatorExpires ... + ParamIndicatorExpires ParamIndicator = "Expires" + // ParamIndicatorKeyID ... + ParamIndicatorKeyID ParamIndicator = "KeyId" + // ParamIndicatorSignature ... + ParamIndicatorSignature ParamIndicator = "Signature" ) // PossibleParamIndicatorValues returns an array of possible values for the ParamIndicator const type. func PossibleParamIndicatorValues() []ParamIndicator { - return []ParamIndicator{Expires, KeyID, Signature} + return []ParamIndicator{ParamIndicatorExpires, ParamIndicatorKeyID, ParamIndicatorSignature} } // PolicyEnabledState enumerates the values for policy enabled state. @@ -803,15 +908,15 @@ func PossiblePolicyEnabledStateValues() []PolicyEnabledState { type PolicyMode string const ( - // Detection ... - Detection PolicyMode = "Detection" - // Prevention ... - Prevention PolicyMode = "Prevention" + // PolicyModeDetection ... + PolicyModeDetection PolicyMode = "Detection" + // PolicyModePrevention ... + PolicyModePrevention PolicyMode = "Prevention" ) // PossiblePolicyModeValues returns an array of possible values for the PolicyMode const type. func PossiblePolicyModeValues() []PolicyMode { - return []PolicyMode{Detection, Prevention} + return []PolicyMode{PolicyModeDetection, PolicyModePrevention} } // PolicyResourceState enumerates the values for policy resource state. @@ -929,15 +1034,15 @@ func PossibleProfileResourceStateValues() []ProfileResourceState { type ProtocolType string const ( - // IPBased ... - IPBased ProtocolType = "IPBased" - // ServerNameIndication ... - ServerNameIndication ProtocolType = "ServerNameIndication" + // ProtocolTypeIPBased ... + ProtocolTypeIPBased ProtocolType = "IPBased" + // ProtocolTypeServerNameIndication ... + ProtocolTypeServerNameIndication ProtocolType = "ServerNameIndication" ) // PossibleProtocolTypeValues returns an array of possible values for the ProtocolType const type. func PossibleProtocolTypeValues() []ProtocolType { - return []ProtocolType{IPBased, ServerNameIndication} + return []ProtocolType{ProtocolTypeIPBased, ProtocolTypeServerNameIndication} } // ProvisioningState enumerates the values for provisioning state. @@ -961,19 +1066,19 @@ func PossibleProvisioningStateValues() []ProvisioningState { type QueryStringBehavior string const ( - // Exclude ... - Exclude QueryStringBehavior = "Exclude" - // ExcludeAll ... - ExcludeAll QueryStringBehavior = "ExcludeAll" - // Include ... - Include QueryStringBehavior = "Include" - // IncludeAll ... - IncludeAll QueryStringBehavior = "IncludeAll" + // QueryStringBehaviorExclude ... + QueryStringBehaviorExclude QueryStringBehavior = "Exclude" + // QueryStringBehaviorExcludeAll ... + QueryStringBehaviorExcludeAll QueryStringBehavior = "ExcludeAll" + // QueryStringBehaviorInclude ... + QueryStringBehaviorInclude QueryStringBehavior = "Include" + // QueryStringBehaviorIncludeAll ... + QueryStringBehaviorIncludeAll QueryStringBehavior = "IncludeAll" ) // PossibleQueryStringBehaviorValues returns an array of possible values for the QueryStringBehavior const type. func PossibleQueryStringBehaviorValues() []QueryStringBehavior { - return []QueryStringBehavior{Exclude, ExcludeAll, Include, IncludeAll} + return []QueryStringBehavior{QueryStringBehaviorExclude, QueryStringBehaviorExcludeAll, QueryStringBehaviorInclude, QueryStringBehaviorIncludeAll} } // QueryStringCachingBehavior enumerates the values for query string caching behavior. @@ -1030,19 +1135,19 @@ func PossibleQueryStringOperatorValues() []QueryStringOperator { type RedirectType string const ( - // Found ... - Found RedirectType = "Found" - // Moved ... - Moved RedirectType = "Moved" - // PermanentRedirect ... - PermanentRedirect RedirectType = "PermanentRedirect" - // TemporaryRedirect ... - TemporaryRedirect RedirectType = "TemporaryRedirect" + // RedirectTypeFound ... + RedirectTypeFound RedirectType = "Found" + // RedirectTypeMoved ... + RedirectTypeMoved RedirectType = "Moved" + // RedirectTypePermanentRedirect ... + RedirectTypePermanentRedirect RedirectType = "PermanentRedirect" + // RedirectTypeTemporaryRedirect ... + RedirectTypeTemporaryRedirect RedirectType = "TemporaryRedirect" ) // PossibleRedirectTypeValues returns an array of possible values for the RedirectType const type. func PossibleRedirectTypeValues() []RedirectType { - return []RedirectType{Found, Moved, PermanentRedirect, TemporaryRedirect} + return []RedirectType{RedirectTypeFound, RedirectTypeMoved, RedirectTypePermanentRedirect, RedirectTypeTemporaryRedirect} } // RemoteAddressOperator enumerates the values for remote address operator. @@ -1159,30 +1264,30 @@ func PossibleRequestURIOperatorValues() []RequestURIOperator { type ResourceType string const ( - // MicrosoftCdnProfilesEndpoints ... - MicrosoftCdnProfilesEndpoints ResourceType = "Microsoft.Cdn/Profiles/Endpoints" + // ResourceTypeMicrosoftCdnProfilesEndpoints ... + ResourceTypeMicrosoftCdnProfilesEndpoints ResourceType = "Microsoft.Cdn/Profiles/Endpoints" ) // PossibleResourceTypeValues returns an array of possible values for the ResourceType const type. func PossibleResourceTypeValues() []ResourceType { - return []ResourceType{MicrosoftCdnProfilesEndpoints} + return []ResourceType{ResourceTypeMicrosoftCdnProfilesEndpoints} } // ResponseBasedDetectedErrorTypes enumerates the values for response based detected error types. type ResponseBasedDetectedErrorTypes string const ( - // None ... - None ResponseBasedDetectedErrorTypes = "None" - // TCPAndHTTPErrors ... - TCPAndHTTPErrors ResponseBasedDetectedErrorTypes = "TcpAndHttpErrors" - // TCPErrorsOnly ... - TCPErrorsOnly ResponseBasedDetectedErrorTypes = "TcpErrorsOnly" + // ResponseBasedDetectedErrorTypesNone ... + ResponseBasedDetectedErrorTypesNone ResponseBasedDetectedErrorTypes = "None" + // ResponseBasedDetectedErrorTypesTCPAndHTTPErrors ... + ResponseBasedDetectedErrorTypesTCPAndHTTPErrors ResponseBasedDetectedErrorTypes = "TcpAndHttpErrors" + // ResponseBasedDetectedErrorTypesTCPErrorsOnly ... + ResponseBasedDetectedErrorTypesTCPErrorsOnly ResponseBasedDetectedErrorTypes = "TcpErrorsOnly" ) // PossibleResponseBasedDetectedErrorTypesValues returns an array of possible values for the ResponseBasedDetectedErrorTypes const type. func PossibleResponseBasedDetectedErrorTypesValues() []ResponseBasedDetectedErrorTypes { - return []ResponseBasedDetectedErrorTypes{None, TCPAndHTTPErrors, TCPErrorsOnly} + return []ResponseBasedDetectedErrorTypes{ResponseBasedDetectedErrorTypesNone, ResponseBasedDetectedErrorTypesTCPAndHTTPErrors, ResponseBasedDetectedErrorTypesTCPErrorsOnly} } // SharedPrivateLinkResourceStatus enumerates the values for shared private link resource status. @@ -1210,73 +1315,73 @@ func PossibleSharedPrivateLinkResourceStatusValues() []SharedPrivateLinkResource type SkuName string const ( - // CustomVerizon ... - CustomVerizon SkuName = "Custom_Verizon" - // PremiumAzureFrontDoor ... - PremiumAzureFrontDoor SkuName = "Premium_AzureFrontDoor" - // PremiumChinaCdn ... - PremiumChinaCdn SkuName = "Premium_ChinaCdn" - // PremiumVerizon ... - PremiumVerizon SkuName = "Premium_Verizon" - // Standard955BandWidthChinaCdn ... - Standard955BandWidthChinaCdn SkuName = "Standard_955BandWidth_ChinaCdn" - // StandardAkamai ... - StandardAkamai SkuName = "Standard_Akamai" - // StandardAvgBandWidthChinaCdn ... - StandardAvgBandWidthChinaCdn SkuName = "Standard_AvgBandWidth_ChinaCdn" - // StandardAzureFrontDoor ... - StandardAzureFrontDoor SkuName = "Standard_AzureFrontDoor" - // StandardChinaCdn ... - StandardChinaCdn SkuName = "Standard_ChinaCdn" - // StandardMicrosoft ... - StandardMicrosoft SkuName = "Standard_Microsoft" - // StandardPlus955BandWidthChinaCdn ... - StandardPlus955BandWidthChinaCdn SkuName = "StandardPlus_955BandWidth_ChinaCdn" - // StandardPlusAvgBandWidthChinaCdn ... - StandardPlusAvgBandWidthChinaCdn SkuName = "StandardPlus_AvgBandWidth_ChinaCdn" - // StandardPlusChinaCdn ... - StandardPlusChinaCdn SkuName = "StandardPlus_ChinaCdn" - // StandardVerizon ... - StandardVerizon SkuName = "Standard_Verizon" + // SkuNameCustomVerizon ... + SkuNameCustomVerizon SkuName = "Custom_Verizon" + // SkuNamePremiumAzureFrontDoor ... + SkuNamePremiumAzureFrontDoor SkuName = "Premium_AzureFrontDoor" + // SkuNamePremiumChinaCdn ... + SkuNamePremiumChinaCdn SkuName = "Premium_ChinaCdn" + // SkuNamePremiumVerizon ... + SkuNamePremiumVerizon SkuName = "Premium_Verizon" + // SkuNameStandard955BandWidthChinaCdn ... + SkuNameStandard955BandWidthChinaCdn SkuName = "Standard_955BandWidth_ChinaCdn" + // SkuNameStandardAkamai ... + SkuNameStandardAkamai SkuName = "Standard_Akamai" + // SkuNameStandardAvgBandWidthChinaCdn ... + SkuNameStandardAvgBandWidthChinaCdn SkuName = "Standard_AvgBandWidth_ChinaCdn" + // SkuNameStandardAzureFrontDoor ... + SkuNameStandardAzureFrontDoor SkuName = "Standard_AzureFrontDoor" + // SkuNameStandardChinaCdn ... + SkuNameStandardChinaCdn SkuName = "Standard_ChinaCdn" + // SkuNameStandardMicrosoft ... + SkuNameStandardMicrosoft SkuName = "Standard_Microsoft" + // SkuNameStandardPlus955BandWidthChinaCdn ... + SkuNameStandardPlus955BandWidthChinaCdn SkuName = "StandardPlus_955BandWidth_ChinaCdn" + // SkuNameStandardPlusAvgBandWidthChinaCdn ... + SkuNameStandardPlusAvgBandWidthChinaCdn SkuName = "StandardPlus_AvgBandWidth_ChinaCdn" + // SkuNameStandardPlusChinaCdn ... + SkuNameStandardPlusChinaCdn SkuName = "StandardPlus_ChinaCdn" + // SkuNameStandardVerizon ... + SkuNameStandardVerizon SkuName = "Standard_Verizon" ) // PossibleSkuNameValues returns an array of possible values for the SkuName const type. func PossibleSkuNameValues() []SkuName { - return []SkuName{CustomVerizon, PremiumAzureFrontDoor, PremiumChinaCdn, PremiumVerizon, Standard955BandWidthChinaCdn, StandardAkamai, StandardAvgBandWidthChinaCdn, StandardAzureFrontDoor, StandardChinaCdn, StandardMicrosoft, StandardPlus955BandWidthChinaCdn, StandardPlusAvgBandWidthChinaCdn, StandardPlusChinaCdn, StandardVerizon} + return []SkuName{SkuNameCustomVerizon, SkuNamePremiumAzureFrontDoor, SkuNamePremiumChinaCdn, SkuNamePremiumVerizon, SkuNameStandard955BandWidthChinaCdn, SkuNameStandardAkamai, SkuNameStandardAvgBandWidthChinaCdn, SkuNameStandardAzureFrontDoor, SkuNameStandardChinaCdn, SkuNameStandardMicrosoft, SkuNameStandardPlus955BandWidthChinaCdn, SkuNameStandardPlusAvgBandWidthChinaCdn, SkuNameStandardPlusChinaCdn, SkuNameStandardVerizon} } // Status enumerates the values for status. type Status string const ( - // AccessDenied ... - AccessDenied Status = "AccessDenied" - // CertificateExpired ... - CertificateExpired Status = "CertificateExpired" - // Invalid ... - Invalid Status = "Invalid" - // Valid ... - Valid Status = "Valid" + // StatusAccessDenied ... + StatusAccessDenied Status = "AccessDenied" + // StatusCertificateExpired ... + StatusCertificateExpired Status = "CertificateExpired" + // StatusInvalid ... + StatusInvalid Status = "Invalid" + // StatusValid ... + StatusValid Status = "Valid" ) // PossibleStatusValues returns an array of possible values for the Status const type. func PossibleStatusValues() []Status { - return []Status{AccessDenied, CertificateExpired, Invalid, Valid} + return []Status{StatusAccessDenied, StatusCertificateExpired, StatusInvalid, StatusValid} } // Transform enumerates the values for transform. type Transform string const ( - // Lowercase ... - Lowercase Transform = "Lowercase" - // Uppercase ... - Uppercase Transform = "Uppercase" + // TransformLowercase ... + TransformLowercase Transform = "Lowercase" + // TransformUppercase ... + TransformUppercase Transform = "Uppercase" ) // PossibleTransformValues returns an array of possible values for the Transform const type. func PossibleTransformValues() []Transform { - return []Transform{Lowercase, Uppercase} + return []Transform{TransformLowercase, TransformUppercase} } // TransformType enumerates the values for transform type. @@ -1321,36 +1426,36 @@ func PossibleTypeValues() []Type { type TypeBasicSecretParameters string const ( - // TypeCustomerCertificate ... - TypeCustomerCertificate TypeBasicSecretParameters = "CustomerCertificate" - // TypeManagedCertificate ... - TypeManagedCertificate TypeBasicSecretParameters = "ManagedCertificate" - // TypeSecretParameters ... - TypeSecretParameters TypeBasicSecretParameters = "SecretParameters" - // TypeURLSigningKey ... - TypeURLSigningKey TypeBasicSecretParameters = "UrlSigningKey" + // TypeBasicSecretParametersTypeCustomerCertificate ... + TypeBasicSecretParametersTypeCustomerCertificate TypeBasicSecretParameters = "CustomerCertificate" + // TypeBasicSecretParametersTypeManagedCertificate ... + TypeBasicSecretParametersTypeManagedCertificate TypeBasicSecretParameters = "ManagedCertificate" + // TypeBasicSecretParametersTypeSecretParameters ... + TypeBasicSecretParametersTypeSecretParameters TypeBasicSecretParameters = "SecretParameters" + // TypeBasicSecretParametersTypeURLSigningKey ... + TypeBasicSecretParametersTypeURLSigningKey TypeBasicSecretParameters = "UrlSigningKey" ) // PossibleTypeBasicSecretParametersValues returns an array of possible values for the TypeBasicSecretParameters const type. func PossibleTypeBasicSecretParametersValues() []TypeBasicSecretParameters { - return []TypeBasicSecretParameters{TypeCustomerCertificate, TypeManagedCertificate, TypeSecretParameters, TypeURLSigningKey} + return []TypeBasicSecretParameters{TypeBasicSecretParametersTypeCustomerCertificate, TypeBasicSecretParametersTypeManagedCertificate, TypeBasicSecretParametersTypeSecretParameters, TypeBasicSecretParametersTypeURLSigningKey} } // Unit enumerates the values for unit. type Unit string const ( - // BitsPerSecond ... - BitsPerSecond Unit = "bitsPerSecond" - // Bytes ... - Bytes Unit = "bytes" - // Count ... - Count Unit = "count" + // UnitBitsPerSecond ... + UnitBitsPerSecond Unit = "bitsPerSecond" + // UnitBytes ... + UnitBytes Unit = "bytes" + // UnitCount ... + UnitCount Unit = "count" ) // PossibleUnitValues returns an array of possible values for the Unit const type. func PossibleUnitValues() []Unit { - return []Unit{BitsPerSecond, Bytes, Count} + return []Unit{UnitBitsPerSecond, UnitBytes, UnitCount} } // Unit1 enumerates the values for unit 1. @@ -1477,3 +1582,111 @@ const ( func PossibleValidateSecretTypeValues() []ValidateSecretType { return []ValidateSecretType{ValidateSecretTypeCustomerCertificate, ValidateSecretTypeManagedCertificate, ValidateSecretTypeURLSigningKey} } + +// WafAction enumerates the values for waf action. +type WafAction string + +const ( + // WafActionAllow ... + WafActionAllow WafAction = "allow" + // WafActionBlock ... + WafActionBlock WafAction = "block" + // WafActionLog ... + WafActionLog WafAction = "log" + // WafActionRedirect ... + WafActionRedirect WafAction = "redirect" +) + +// PossibleWafActionValues returns an array of possible values for the WafAction const type. +func PossibleWafActionValues() []WafAction { + return []WafAction{WafActionAllow, WafActionBlock, WafActionLog, WafActionRedirect} +} + +// WafGranularity enumerates the values for waf granularity. +type WafGranularity string + +const ( + // WafGranularityP1D ... + WafGranularityP1D WafGranularity = "P1D" + // WafGranularityPT1H ... + WafGranularityPT1H WafGranularity = "PT1H" + // WafGranularityPT5M ... + WafGranularityPT5M WafGranularity = "PT5M" +) + +// PossibleWafGranularityValues returns an array of possible values for the WafGranularity const type. +func PossibleWafGranularityValues() []WafGranularity { + return []WafGranularity{WafGranularityP1D, WafGranularityPT1H, WafGranularityPT5M} +} + +// WafMetric enumerates the values for waf metric. +type WafMetric string + +const ( + // WafMetricClientRequestCount ... + WafMetricClientRequestCount WafMetric = "clientRequestCount" +) + +// PossibleWafMetricValues returns an array of possible values for the WafMetric const type. +func PossibleWafMetricValues() []WafMetric { + return []WafMetric{WafMetricClientRequestCount} +} + +// WafRankingGroupBy enumerates the values for waf ranking group by. +type WafRankingGroupBy string + +const ( + // WafRankingGroupByCustomDomain ... + WafRankingGroupByCustomDomain WafRankingGroupBy = "customDomain" + // WafRankingGroupByHTTPStatusCode ... + WafRankingGroupByHTTPStatusCode WafRankingGroupBy = "httpStatusCode" +) + +// PossibleWafRankingGroupByValues returns an array of possible values for the WafRankingGroupBy const type. +func PossibleWafRankingGroupByValues() []WafRankingGroupBy { + return []WafRankingGroupBy{WafRankingGroupByCustomDomain, WafRankingGroupByHTTPStatusCode} +} + +// WafRankingType enumerates the values for waf ranking type. +type WafRankingType string + +const ( + // WafRankingTypeAction ... + WafRankingTypeAction WafRankingType = "action" + // WafRankingTypeClientIP ... + WafRankingTypeClientIP WafRankingType = "clientIp" + // WafRankingTypeCountry ... + WafRankingTypeCountry WafRankingType = "country" + // WafRankingTypeRuleGroup ... + WafRankingTypeRuleGroup WafRankingType = "ruleGroup" + // WafRankingTypeRuleID ... + WafRankingTypeRuleID WafRankingType = "ruleId" + // WafRankingTypeRuleType ... + WafRankingTypeRuleType WafRankingType = "ruleType" + // WafRankingTypeURL ... + WafRankingTypeURL WafRankingType = "url" + // WafRankingTypeUserAgent ... + WafRankingTypeUserAgent WafRankingType = "userAgent" +) + +// PossibleWafRankingTypeValues returns an array of possible values for the WafRankingType const type. +func PossibleWafRankingTypeValues() []WafRankingType { + return []WafRankingType{WafRankingTypeAction, WafRankingTypeClientIP, WafRankingTypeCountry, WafRankingTypeRuleGroup, WafRankingTypeRuleID, WafRankingTypeRuleType, WafRankingTypeURL, WafRankingTypeUserAgent} +} + +// WafRuleType enumerates the values for waf rule type. +type WafRuleType string + +const ( + // WafRuleTypeBot ... + WafRuleTypeBot WafRuleType = "bot" + // WafRuleTypeCustom ... + WafRuleTypeCustom WafRuleType = "custom" + // WafRuleTypeManaged ... + WafRuleTypeManaged WafRuleType = "managed" +) + +// PossibleWafRuleTypeValues returns an array of possible values for the WafRuleType const type. +func PossibleWafRuleTypeValues() []WafRuleType { + return []WafRuleType{WafRuleTypeBot, WafRuleTypeCustom, WafRuleTypeManaged} +} diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/loganalytics.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/loganalytics.go index aa900b955ae0..bae499fb0c8e 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/loganalytics.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/loganalytics.go @@ -121,7 +121,7 @@ func (client LogAnalyticsClient) GetLogAnalyticsLocationsResponder(resp *http.Re // resourceGroupName - name of the Resource group within the Azure subscription. // profileName - name of the CDN profile which is unique within the resource group. // granularity - -func (client LogAnalyticsClient) GetLogAnalyticsMetrics(ctx context.Context, resourceGroupName string, profileName string, metrics []string, dateTimeBegin date.Time, dateTimeEnd date.Time, granularity string, groupBy []string, continents []string, countryOrRegions []string, customDomains []string, protocols []string) (result MetricsResponse, err error) { +func (client LogAnalyticsClient) GetLogAnalyticsMetrics(ctx context.Context, resourceGroupName string, profileName string, metrics []LogMetric, dateTimeBegin date.Time, dateTimeEnd date.Time, granularity LogMetricsGranularity, customDomains []string, protocols []string, groupBy []LogMetricsGroupBy, continents []string, countryOrRegions []string) (result MetricsResponse, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/LogAnalyticsClient.GetLogAnalyticsMetrics") defer func() { @@ -138,11 +138,15 @@ func (client LogAnalyticsClient) GetLogAnalyticsMetrics(ctx context.Context, res {Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}, {Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}, {TargetValue: metrics, - Constraints: []validation.Constraint{{Target: "metrics", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { + Constraints: []validation.Constraint{{Target: "metrics", Name: validation.Null, Rule: true, Chain: nil}}}, + {TargetValue: customDomains, + Constraints: []validation.Constraint{{Target: "customDomains", Name: validation.Null, Rule: true, Chain: nil}}}, + {TargetValue: protocols, + Constraints: []validation.Constraint{{Target: "protocols", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { return result, validation.NewError("cdn.LogAnalyticsClient", "GetLogAnalyticsMetrics", err.Error()) } - req, err := client.GetLogAnalyticsMetricsPreparer(ctx, resourceGroupName, profileName, metrics, dateTimeBegin, dateTimeEnd, granularity, groupBy, continents, countryOrRegions, customDomains, protocols) + req, err := client.GetLogAnalyticsMetricsPreparer(ctx, resourceGroupName, profileName, metrics, dateTimeBegin, dateTimeEnd, granularity, customDomains, protocols, groupBy, continents, countryOrRegions) if err != nil { err = autorest.NewErrorWithError(err, "cdn.LogAnalyticsClient", "GetLogAnalyticsMetrics", nil, "Failure preparing request") return @@ -165,7 +169,7 @@ func (client LogAnalyticsClient) GetLogAnalyticsMetrics(ctx context.Context, res } // GetLogAnalyticsMetricsPreparer prepares the GetLogAnalyticsMetrics request. -func (client LogAnalyticsClient) GetLogAnalyticsMetricsPreparer(ctx context.Context, resourceGroupName string, profileName string, metrics []string, dateTimeBegin date.Time, dateTimeEnd date.Time, granularity string, groupBy []string, continents []string, countryOrRegions []string, customDomains []string, protocols []string) (*http.Request, error) { +func (client LogAnalyticsClient) GetLogAnalyticsMetricsPreparer(ctx context.Context, resourceGroupName string, profileName string, metrics []LogMetric, dateTimeBegin date.Time, dateTimeEnd date.Time, granularity LogMetricsGranularity, customDomains []string, protocols []string, groupBy []LogMetricsGroupBy, continents []string, countryOrRegions []string) (*http.Request, error) { pathParameters := map[string]interface{}{ "profileName": autorest.Encode("path", profileName), "resourceGroupName": autorest.Encode("path", resourceGroupName), @@ -175,25 +179,21 @@ func (client LogAnalyticsClient) GetLogAnalyticsMetricsPreparer(ctx context.Cont const APIVersion = "2020-09-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, + "customDomains": customDomains, "dateTimeBegin": autorest.Encode("query", dateTimeBegin), "dateTimeEnd": autorest.Encode("query", dateTimeEnd), "granularity": autorest.Encode("query", granularity), - "metrics": autorest.Encode("query", metrics, ","), + "metrics": metrics, + "protocols": protocols, } if groupBy != nil && len(groupBy) > 0 { - queryParameters["groupBy"] = autorest.Encode("query", groupBy, ",") + queryParameters["groupBy"] = groupBy } if continents != nil && len(continents) > 0 { - queryParameters["continents"] = autorest.Encode("query", continents, ",") + queryParameters["continents"] = continents } if countryOrRegions != nil && len(countryOrRegions) > 0 { - queryParameters["countryOrRegions"] = autorest.Encode("query", countryOrRegions, ",") - } - if customDomains != nil && len(customDomains) > 0 { - queryParameters["customDomains"] = autorest.Encode("query", customDomains, ",") - } - if protocols != nil && len(protocols) > 0 { - queryParameters["protocols"] = autorest.Encode("query", protocols, ",") + queryParameters["countryOrRegions"] = countryOrRegions } preparer := autorest.CreatePreparer( @@ -226,7 +226,7 @@ func (client LogAnalyticsClient) GetLogAnalyticsMetricsResponder(resp *http.Resp // Parameters: // resourceGroupName - name of the Resource group within the Azure subscription. // profileName - name of the CDN profile which is unique within the resource group. -func (client LogAnalyticsClient) GetLogAnalyticsRankings(ctx context.Context, resourceGroupName string, profileName string, rankings []string, metrics []string, maxRanking int32, dateTimeBegin date.Time, dateTimeEnd date.Time, customDomains []string) (result RankingsResponse, err error) { +func (client LogAnalyticsClient) GetLogAnalyticsRankings(ctx context.Context, resourceGroupName string, profileName string, rankings []LogRanking, metrics []LogRankingMetric, maxRanking int32, dateTimeBegin date.Time, dateTimeEnd date.Time, customDomains []string) (result RankingsResponse, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/LogAnalyticsClient.GetLogAnalyticsRankings") defer func() { @@ -272,7 +272,7 @@ func (client LogAnalyticsClient) GetLogAnalyticsRankings(ctx context.Context, re } // GetLogAnalyticsRankingsPreparer prepares the GetLogAnalyticsRankings request. -func (client LogAnalyticsClient) GetLogAnalyticsRankingsPreparer(ctx context.Context, resourceGroupName string, profileName string, rankings []string, metrics []string, maxRanking int32, dateTimeBegin date.Time, dateTimeEnd date.Time, customDomains []string) (*http.Request, error) { +func (client LogAnalyticsClient) GetLogAnalyticsRankingsPreparer(ctx context.Context, resourceGroupName string, profileName string, rankings []LogRanking, metrics []LogRankingMetric, maxRanking int32, dateTimeBegin date.Time, dateTimeEnd date.Time, customDomains []string) (*http.Request, error) { pathParameters := map[string]interface{}{ "profileName": autorest.Encode("path", profileName), "resourceGroupName": autorest.Encode("path", resourceGroupName), @@ -285,11 +285,11 @@ func (client LogAnalyticsClient) GetLogAnalyticsRankingsPreparer(ctx context.Con "dateTimeBegin": autorest.Encode("query", dateTimeBegin), "dateTimeEnd": autorest.Encode("query", dateTimeEnd), "maxRanking": autorest.Encode("query", maxRanking), - "metrics": autorest.Encode("query", metrics, ","), - "rankings": autorest.Encode("query", rankings, ","), + "metrics": metrics, + "rankings": rankings, } if customDomains != nil && len(customDomains) > 0 { - queryParameters["customDomains"] = autorest.Encode("query", customDomains, ",") + queryParameters["customDomains"] = customDomains } preparer := autorest.CreatePreparer( @@ -407,7 +407,7 @@ func (client LogAnalyticsClient) GetLogAnalyticsResourcesResponder(resp *http.Re // resourceGroupName - name of the Resource group within the Azure subscription. // profileName - name of the CDN profile which is unique within the resource group. // granularity - -func (client LogAnalyticsClient) GetWafLogAnalyticsMetrics(ctx context.Context, resourceGroupName string, profileName string, metrics []string, dateTimeBegin date.Time, dateTimeEnd date.Time, granularity string, actions []string, groupBy []string, ruleTypes []string) (result WafMetricsResponse, err error) { +func (client LogAnalyticsClient) GetWafLogAnalyticsMetrics(ctx context.Context, resourceGroupName string, profileName string, metrics []WafMetric, dateTimeBegin date.Time, dateTimeEnd date.Time, granularity WafGranularity, actions []WafAction, groupBy []WafRankingGroupBy, ruleTypes []WafRuleType) (result WafMetricsResponse, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/LogAnalyticsClient.GetWafLogAnalyticsMetrics") defer func() { @@ -451,7 +451,7 @@ func (client LogAnalyticsClient) GetWafLogAnalyticsMetrics(ctx context.Context, } // GetWafLogAnalyticsMetricsPreparer prepares the GetWafLogAnalyticsMetrics request. -func (client LogAnalyticsClient) GetWafLogAnalyticsMetricsPreparer(ctx context.Context, resourceGroupName string, profileName string, metrics []string, dateTimeBegin date.Time, dateTimeEnd date.Time, granularity string, actions []string, groupBy []string, ruleTypes []string) (*http.Request, error) { +func (client LogAnalyticsClient) GetWafLogAnalyticsMetricsPreparer(ctx context.Context, resourceGroupName string, profileName string, metrics []WafMetric, dateTimeBegin date.Time, dateTimeEnd date.Time, granularity WafGranularity, actions []WafAction, groupBy []WafRankingGroupBy, ruleTypes []WafRuleType) (*http.Request, error) { pathParameters := map[string]interface{}{ "profileName": autorest.Encode("path", profileName), "resourceGroupName": autorest.Encode("path", resourceGroupName), @@ -464,16 +464,16 @@ func (client LogAnalyticsClient) GetWafLogAnalyticsMetricsPreparer(ctx context.C "dateTimeBegin": autorest.Encode("query", dateTimeBegin), "dateTimeEnd": autorest.Encode("query", dateTimeEnd), "granularity": autorest.Encode("query", granularity), - "metrics": autorest.Encode("query", metrics, ","), + "metrics": metrics, } if actions != nil && len(actions) > 0 { - queryParameters["actions"] = autorest.Encode("query", actions, ",") + queryParameters["actions"] = actions } if groupBy != nil && len(groupBy) > 0 { - queryParameters["groupBy"] = autorest.Encode("query", groupBy, ",") + queryParameters["groupBy"] = groupBy } if ruleTypes != nil && len(ruleTypes) > 0 { - queryParameters["ruleTypes"] = autorest.Encode("query", ruleTypes, ",") + queryParameters["ruleTypes"] = ruleTypes } preparer := autorest.CreatePreparer( @@ -506,7 +506,7 @@ func (client LogAnalyticsClient) GetWafLogAnalyticsMetricsResponder(resp *http.R // Parameters: // resourceGroupName - name of the Resource group within the Azure subscription. // profileName - name of the CDN profile which is unique within the resource group. -func (client LogAnalyticsClient) GetWafLogAnalyticsRankings(ctx context.Context, resourceGroupName string, profileName string, metrics []string, dateTimeBegin date.Time, dateTimeEnd date.Time, maxRanking int32, rankings []string, actions []string, ruleTypes []string) (result WafRankingsResponse, err error) { +func (client LogAnalyticsClient) GetWafLogAnalyticsRankings(ctx context.Context, resourceGroupName string, profileName string, metrics []WafMetric, dateTimeBegin date.Time, dateTimeEnd date.Time, maxRanking int32, rankings []WafRankingType, actions []WafAction, ruleTypes []WafRuleType) (result WafRankingsResponse, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/LogAnalyticsClient.GetWafLogAnalyticsRankings") defer func() { @@ -552,7 +552,7 @@ func (client LogAnalyticsClient) GetWafLogAnalyticsRankings(ctx context.Context, } // GetWafLogAnalyticsRankingsPreparer prepares the GetWafLogAnalyticsRankings request. -func (client LogAnalyticsClient) GetWafLogAnalyticsRankingsPreparer(ctx context.Context, resourceGroupName string, profileName string, metrics []string, dateTimeBegin date.Time, dateTimeEnd date.Time, maxRanking int32, rankings []string, actions []string, ruleTypes []string) (*http.Request, error) { +func (client LogAnalyticsClient) GetWafLogAnalyticsRankingsPreparer(ctx context.Context, resourceGroupName string, profileName string, metrics []WafMetric, dateTimeBegin date.Time, dateTimeEnd date.Time, maxRanking int32, rankings []WafRankingType, actions []WafAction, ruleTypes []WafRuleType) (*http.Request, error) { pathParameters := map[string]interface{}{ "profileName": autorest.Encode("path", profileName), "resourceGroupName": autorest.Encode("path", resourceGroupName), @@ -565,14 +565,14 @@ func (client LogAnalyticsClient) GetWafLogAnalyticsRankingsPreparer(ctx context. "dateTimeBegin": autorest.Encode("query", dateTimeBegin), "dateTimeEnd": autorest.Encode("query", dateTimeEnd), "maxRanking": autorest.Encode("query", maxRanking), - "metrics": autorest.Encode("query", metrics, ","), - "rankings": autorest.Encode("query", rankings, ","), + "metrics": metrics, + "rankings": rankings, } if actions != nil && len(actions) > 0 { - queryParameters["actions"] = autorest.Encode("query", actions, ",") + queryParameters["actions"] = actions } if ruleTypes != nil && len(ruleTypes) > 0 { - queryParameters["ruleTypes"] = autorest.Encode("query", ruleTypes, ",") + queryParameters["ruleTypes"] = ruleTypes } preparer := autorest.CreatePreparer( diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/models.go index 21d1385408eb..f9abf6dade3c 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/models.go @@ -191,14 +191,14 @@ func (future *AFDCustomDomainsUpdateFuture) result(client AFDCustomDomainsClient type AFDDomain struct { autorest.Response `json:"-"` *AFDDomainProperties `json:"properties,omitempty"` - // SystemData - READ-ONLY - SystemData *SystemData `json:"systemData,omitempty"` // ID - READ-ONLY; Resource ID. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for AFDDomain. @@ -228,15 +228,6 @@ func (ad *AFDDomain) UnmarshalJSON(body []byte) error { } ad.AFDDomainProperties = &aFDDomainProperties } - case "systemData": - if v != nil { - var systemData SystemData - err = json.Unmarshal(*v, &systemData) - if err != nil { - return err - } - ad.SystemData = &systemData - } case "id": if v != nil { var ID string @@ -264,6 +255,15 @@ func (ad *AFDDomain) UnmarshalJSON(body []byte) error { } ad.Type = &typeVar } + case "systemData": + if v != nil { + var systemData SystemData + err = json.Unmarshal(*v, &systemData) + if err != nil { + return err + } + ad.SystemData = &systemData + } } } @@ -274,7 +274,7 @@ func (ad *AFDDomain) UnmarshalJSON(body []byte) error { type AFDDomainHTTPSParameters struct { // CertificateType - Defines the source of the SSL certificate. Possible values include: 'AfdCertificateTypeCustomerCertificate', 'AfdCertificateTypeManagedCertificate' CertificateType AfdCertificateType `json:"certificateType,omitempty"` - // MinimumTLSVersion - TLS protocol version that will be used for Https. Possible values include: 'TLS10', 'TLS12' + // MinimumTLSVersion - TLS protocol version that will be used for Https. Possible values include: 'AfdMinimumTLSVersionTLS10', 'AfdMinimumTLSVersionTLS12' MinimumTLSVersion AfdMinimumTLSVersion `json:"minimumTlsVersion,omitempty"` // Secret - Resource reference to the secret. ie. subs/rg/profile/secret Secret *ResourceReference `json:"secret,omitempty"` @@ -455,11 +455,11 @@ type AFDDomainProperties struct { TLSSettings *AFDDomainHTTPSParameters `json:"tlsSettings,omitempty"` // AzureDNSZone - Resource reference to the Azure DNS zone AzureDNSZone *ResourceReference `json:"azureDnsZone,omitempty"` - // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'Succeeded', 'Failed', 'Updating', 'Deleting', 'Creating' + // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'AfdProvisioningStateSucceeded', 'AfdProvisioningStateFailed', 'AfdProvisioningStateUpdating', 'AfdProvisioningStateDeleting', 'AfdProvisioningStateCreating' ProvisioningState AfdProvisioningState `json:"provisioningState,omitempty"` // DeploymentStatus - READ-ONLY; Possible values include: 'DeploymentStatusNotStarted', 'DeploymentStatusInProgress', 'DeploymentStatusSucceeded', 'DeploymentStatusFailed' DeploymentStatus DeploymentStatus `json:"deploymentStatus,omitempty"` - // DomainValidationState - READ-ONLY; Provisioning substate shows the progress of custom HTTPS enabling/disabling process step by step. DCV stands for DomainControlValidation. Possible values include: 'Unknown', 'Submitting', 'Pending', 'TimedOut', 'PendingRevalidation', 'Approved' + // DomainValidationState - READ-ONLY; Provisioning substate shows the progress of custom HTTPS enabling/disabling process step by step. DCV stands for DomainControlValidation. Possible values include: 'DomainValidationStateUnknown', 'DomainValidationStateSubmitting', 'DomainValidationStatePending', 'DomainValidationStateTimedOut', 'DomainValidationStatePendingRevalidation', 'DomainValidationStateApproved' DomainValidationState DomainValidationState `json:"domainValidationState,omitempty"` // HostName - The host name of the domain. Must be a domain name. HostName *string `json:"hostName,omitempty"` @@ -539,14 +539,14 @@ type AFDEndpoint struct { Location *string `json:"location,omitempty"` // Tags - Resource tags. Tags map[string]*string `json:"tags"` - // SystemData - READ-ONLY - SystemData *SystemData `json:"systemData,omitempty"` // ID - READ-ONLY; Resource ID. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for AFDEndpoint. @@ -600,15 +600,6 @@ func (ae *AFDEndpoint) UnmarshalJSON(body []byte) error { } ae.Tags = tags } - case "systemData": - if v != nil { - var systemData SystemData - err = json.Unmarshal(*v, &systemData) - if err != nil { - return err - } - ae.SystemData = &systemData - } case "id": if v != nil { var ID string @@ -636,6 +627,15 @@ func (ae *AFDEndpoint) UnmarshalJSON(body []byte) error { } ae.Type = &typeVar } + case "systemData": + if v != nil { + var systemData SystemData + err = json.Unmarshal(*v, &systemData) + if err != nil { + return err + } + ae.SystemData = &systemData + } } } @@ -817,7 +817,7 @@ type AFDEndpointProperties struct { OriginResponseTimeoutSeconds *int32 `json:"originResponseTimeoutSeconds,omitempty"` // EnabledState - Whether to enable use of this rule. Permitted values are 'Enabled' or 'Disabled'. Possible values include: 'EnabledStateEnabled', 'EnabledStateDisabled' EnabledState EnabledState `json:"enabledState,omitempty"` - // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'Succeeded', 'Failed', 'Updating', 'Deleting', 'Creating' + // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'AfdProvisioningStateSucceeded', 'AfdProvisioningStateFailed', 'AfdProvisioningStateUpdating', 'AfdProvisioningStateDeleting', 'AfdProvisioningStateCreating' ProvisioningState AfdProvisioningState `json:"provisioningState,omitempty"` // DeploymentStatus - READ-ONLY; Possible values include: 'DeploymentStatusNotStarted', 'DeploymentStatusInProgress', 'DeploymentStatusSucceeded', 'DeploymentStatusFailed' DeploymentStatus DeploymentStatus `json:"deploymentStatus,omitempty"` @@ -1070,14 +1070,14 @@ type AfdErrorResponse struct { type AFDOrigin struct { autorest.Response `json:"-"` *AFDOriginProperties `json:"properties,omitempty"` - // SystemData - READ-ONLY - SystemData *SystemData `json:"systemData,omitempty"` // ID - READ-ONLY; Resource ID. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for AFDOrigin. @@ -1107,15 +1107,6 @@ func (ao *AFDOrigin) UnmarshalJSON(body []byte) error { } ao.AFDOriginProperties = &aFDOriginProperties } - case "systemData": - if v != nil { - var systemData SystemData - err = json.Unmarshal(*v, &systemData) - if err != nil { - return err - } - ao.SystemData = &systemData - } case "id": if v != nil { var ID string @@ -1143,6 +1134,15 @@ func (ao *AFDOrigin) UnmarshalJSON(body []byte) error { } ao.Type = &typeVar } + case "systemData": + if v != nil { + var systemData SystemData + err = json.Unmarshal(*v, &systemData) + if err != nil { + return err + } + ao.SystemData = &systemData + } } } @@ -1154,14 +1154,14 @@ func (ao *AFDOrigin) UnmarshalJSON(body []byte) error { type AFDOriginGroup struct { autorest.Response `json:"-"` *AFDOriginGroupProperties `json:"properties,omitempty"` - // SystemData - READ-ONLY - SystemData *SystemData `json:"systemData,omitempty"` // ID - READ-ONLY; Resource ID. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for AFDOriginGroup. @@ -1191,15 +1191,6 @@ func (aog *AFDOriginGroup) UnmarshalJSON(body []byte) error { } aog.AFDOriginGroupProperties = &aFDOriginGroupProperties } - case "systemData": - if v != nil { - var systemData SystemData - err = json.Unmarshal(*v, &systemData) - if err != nil { - return err - } - aog.SystemData = &systemData - } case "id": if v != nil { var ID string @@ -1227,6 +1218,15 @@ func (aog *AFDOriginGroup) UnmarshalJSON(body []byte) error { } aog.Type = &typeVar } + case "systemData": + if v != nil { + var systemData SystemData + err = json.Unmarshal(*v, &systemData) + if err != nil { + return err + } + aog.SystemData = &systemData + } } } @@ -1414,7 +1414,7 @@ type AFDOriginGroupProperties struct { ResponseBasedAfdOriginErrorDetectionSettings *ResponseBasedOriginErrorDetectionParameters `json:"responseBasedAfdOriginErrorDetectionSettings,omitempty"` // SessionAffinityState - Whether to allow session affinity on this host. Valid options are 'Enabled' or 'Disabled'. Possible values include: 'EnabledStateEnabled', 'EnabledStateDisabled' SessionAffinityState EnabledState `json:"sessionAffinityState,omitempty"` - // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'Succeeded', 'Failed', 'Updating', 'Deleting', 'Creating' + // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'AfdProvisioningStateSucceeded', 'AfdProvisioningStateFailed', 'AfdProvisioningStateUpdating', 'AfdProvisioningStateDeleting', 'AfdProvisioningStateCreating' ProvisioningState AfdProvisioningState `json:"provisioningState,omitempty"` // DeploymentStatus - READ-ONLY; Possible values include: 'DeploymentStatusNotStarted', 'DeploymentStatusInProgress', 'DeploymentStatusSucceeded', 'DeploymentStatusFailed' DeploymentStatus DeploymentStatus `json:"deploymentStatus,omitempty"` @@ -1806,7 +1806,7 @@ type AFDOriginProperties struct { SharedPrivateLinkResource interface{} `json:"sharedPrivateLinkResource,omitempty"` // EnabledState - Whether to enable health probes to be made against backends defined under backendPools. Health probes can only be disabled if there is a single enabled backend in single enabled backend pool. Possible values include: 'EnabledStateEnabled', 'EnabledStateDisabled' EnabledState EnabledState `json:"enabledState,omitempty"` - // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'Succeeded', 'Failed', 'Updating', 'Deleting', 'Creating' + // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'AfdProvisioningStateSucceeded', 'AfdProvisioningStateFailed', 'AfdProvisioningStateUpdating', 'AfdProvisioningStateDeleting', 'AfdProvisioningStateCreating' ProvisioningState AfdProvisioningState `json:"provisioningState,omitempty"` // DeploymentStatus - READ-ONLY; Possible values include: 'DeploymentStatusNotStarted', 'DeploymentStatusInProgress', 'DeploymentStatusSucceeded', 'DeploymentStatusFailed' DeploymentStatus DeploymentStatus `json:"deploymentStatus,omitempty"` @@ -2038,7 +2038,7 @@ type AfdPurgeParameters struct { // AFDStateProperties the tracking states for afd resources. type AFDStateProperties struct { - // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'Succeeded', 'Failed', 'Updating', 'Deleting', 'Creating' + // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'AfdProvisioningStateSucceeded', 'AfdProvisioningStateFailed', 'AfdProvisioningStateUpdating', 'AfdProvisioningStateDeleting', 'AfdProvisioningStateCreating' ProvisioningState AfdProvisioningState `json:"provisioningState,omitempty"` // DeploymentStatus - READ-ONLY; Possible values include: 'DeploymentStatusNotStarted', 'DeploymentStatusInProgress', 'DeploymentStatusSucceeded', 'DeploymentStatusFailed' DeploymentStatus DeploymentStatus `json:"deploymentStatus,omitempty"` @@ -2053,7 +2053,7 @@ func (asp AFDStateProperties) MarshalJSON() ([]byte, error) { // CacheExpirationActionParameters defines the parameters for the cache expiration action. type CacheExpirationActionParameters struct { OdataType *string `json:"@odata.type,omitempty"` - // CacheBehavior - Caching behavior for the requests. Possible values include: 'BypassCache', 'Override', 'SetIfMissing' + // CacheBehavior - Caching behavior for the requests. Possible values include: 'CacheBehaviorBypassCache', 'CacheBehaviorOverride', 'CacheBehaviorSetIfMissing' CacheBehavior CacheBehavior `json:"cacheBehavior,omitempty"` // CacheType - The level at which the content needs to be cached. CacheType *string `json:"cacheType,omitempty"` @@ -2064,7 +2064,7 @@ type CacheExpirationActionParameters struct { // CacheKeyQueryStringActionParameters defines the parameters for the cache-key query string action. type CacheKeyQueryStringActionParameters struct { OdataType *string `json:"@odata.type,omitempty"` - // QueryStringBehavior - Caching behavior for the requests. Possible values include: 'Include', 'IncludeAll', 'Exclude', 'ExcludeAll' + // QueryStringBehavior - Caching behavior for the requests. Possible values include: 'QueryStringBehaviorInclude', 'QueryStringBehaviorIncludeAll', 'QueryStringBehaviorExclude', 'QueryStringBehaviorExcludeAll' QueryStringBehavior QueryStringBehavior `json:"queryStringBehavior,omitempty"` // QueryParameters - query parameters to include or exclude (comma separated). QueryParameters *string `json:"queryParameters,omitempty"` @@ -2084,7 +2084,7 @@ type Certificate struct { // domain. type CertificateSourceParameters struct { OdataType *string `json:"@odata.type,omitempty"` - // CertificateType - Type of certificate used. Possible values include: 'Shared', 'Dedicated' + // CertificateType - Type of certificate used. Possible values include: 'CertificateTypeShared', 'CertificateTypeDedicated' CertificateType CertificateType `json:"certificateType,omitempty"` } @@ -2152,7 +2152,7 @@ type CookiesMatchConditionParameters struct { OdataType *string `json:"@odata.type,omitempty"` // Selector - Name of Cookies to be matched Selector *string `json:"selector,omitempty"` - // Operator - Describes operator to be matched. Possible values include: 'Any', 'Equal', 'Contains', 'BeginsWith', 'EndsWith', 'LessThan', 'LessThanOrEqual', 'GreaterThan', 'GreaterThanOrEqual', 'RegEx' + // Operator - Describes operator to be matched. Possible values include: 'CookiesOperatorAny', 'CookiesOperatorEqual', 'CookiesOperatorContains', 'CookiesOperatorBeginsWith', 'CookiesOperatorEndsWith', 'CookiesOperatorLessThan', 'CookiesOperatorLessThanOrEqual', 'CookiesOperatorGreaterThan', 'CookiesOperatorGreaterThanOrEqual', 'CookiesOperatorRegEx' Operator CookiesOperator `json:"operator,omitempty"` // NegateCondition - Describes if this is negate condition or not NegateCondition *bool `json:"negateCondition,omitempty"` @@ -2167,14 +2167,14 @@ type CookiesMatchConditionParameters struct { type CustomDomain struct { autorest.Response `json:"-"` *CustomDomainProperties `json:"properties,omitempty"` - // SystemData - READ-ONLY - SystemData *SystemData `json:"systemData,omitempty"` // ID - READ-ONLY; Resource ID. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for CustomDomain. @@ -2204,15 +2204,6 @@ func (cd *CustomDomain) UnmarshalJSON(body []byte) error { } cd.CustomDomainProperties = &customDomainProperties } - case "systemData": - if v != nil { - var systemData SystemData - err = json.Unmarshal(*v, &systemData) - if err != nil { - return err - } - cd.SystemData = &systemData - } case "id": if v != nil { var ID string @@ -2240,6 +2231,15 @@ func (cd *CustomDomain) UnmarshalJSON(body []byte) error { } cd.Type = &typeVar } + case "systemData": + if v != nil { + var systemData SystemData + err = json.Unmarshal(*v, &systemData) + if err != nil { + return err + } + cd.SystemData = &systemData + } } } @@ -2255,7 +2255,7 @@ type BasicCustomDomainHTTPSParameters interface { // CustomDomainHTTPSParameters the JSON object that contains the properties to secure a custom domain. type CustomDomainHTTPSParameters struct { - // ProtocolType - Defines the TLS extension protocol that is used for secure delivery. Possible values include: 'ServerNameIndication', 'IPBased' + // ProtocolType - Defines the TLS extension protocol that is used for secure delivery. Possible values include: 'ProtocolTypeServerNameIndication', 'ProtocolTypeIPBased' ProtocolType ProtocolType `json:"protocolType,omitempty"` // MinimumTLSVersion - TLS protocol version that will be used for Https. Possible values include: 'MinimumTLSVersionNone', 'MinimumTLSVersionTLS10', 'MinimumTLSVersionTLS12' MinimumTLSVersion MinimumTLSVersion `json:"minimumTlsVersion,omitempty"` @@ -2555,8 +2555,10 @@ type CustomDomainProperties struct { ResourceState CustomDomainResourceState `json:"resourceState,omitempty"` // CustomHTTPSProvisioningState - READ-ONLY; Provisioning status of Custom Https of the custom domain. Possible values include: 'CustomHTTPSProvisioningStateEnabling', 'CustomHTTPSProvisioningStateEnabled', 'CustomHTTPSProvisioningStateDisabling', 'CustomHTTPSProvisioningStateDisabled', 'CustomHTTPSProvisioningStateFailed' CustomHTTPSProvisioningState CustomHTTPSProvisioningState `json:"customHttpsProvisioningState,omitempty"` - // CustomHTTPSProvisioningSubstate - READ-ONLY; Provisioning substate shows the progress of custom HTTPS enabling/disabling process step by step. Possible values include: 'SubmittingDomainControlValidationRequest', 'PendingDomainControlValidationREquestApproval', 'DomainControlValidationRequestApproved', 'DomainControlValidationRequestRejected', 'DomainControlValidationRequestTimedOut', 'IssuingCertificate', 'DeployingCertificate', 'CertificateDeployed', 'DeletingCertificate', 'CertificateDeleted' + // CustomHTTPSProvisioningSubstate - READ-ONLY; Provisioning substate shows the progress of custom HTTPS enabling/disabling process step by step. Possible values include: 'CustomHTTPSProvisioningSubstateSubmittingDomainControlValidationRequest', 'CustomHTTPSProvisioningSubstatePendingDomainControlValidationREquestApproval', 'CustomHTTPSProvisioningSubstateDomainControlValidationRequestApproved', 'CustomHTTPSProvisioningSubstateDomainControlValidationRequestRejected', 'CustomHTTPSProvisioningSubstateDomainControlValidationRequestTimedOut', 'CustomHTTPSProvisioningSubstateIssuingCertificate', 'CustomHTTPSProvisioningSubstateDeployingCertificate', 'CustomHTTPSProvisioningSubstateCertificateDeployed', 'CustomHTTPSProvisioningSubstateDeletingCertificate', 'CustomHTTPSProvisioningSubstateCertificateDeleted' CustomHTTPSProvisioningSubstate CustomHTTPSProvisioningSubstate `json:"customHttpsProvisioningSubstate,omitempty"` + // CustomHTTPSParameters - Certificate parameters for securing custom HTTPS + CustomHTTPSParameters BasicCustomDomainHTTPSParameters `json:"customHttpsParameters,omitempty"` // ValidationData - Special validation or data may be required when delivering CDN to some regions due to local compliance reasons. E.g. ICP license number of a custom domain is required to deliver content in China. ValidationData *string `json:"validationData,omitempty"` // ProvisioningState - READ-ONLY; Provisioning status of the custom domain. @@ -2569,12 +2571,90 @@ func (cdp CustomDomainProperties) MarshalJSON() ([]byte, error) { if cdp.HostName != nil { objectMap["hostName"] = cdp.HostName } + objectMap["customHttpsParameters"] = cdp.CustomHTTPSParameters if cdp.ValidationData != nil { objectMap["validationData"] = cdp.ValidationData } return json.Marshal(objectMap) } +// UnmarshalJSON is the custom unmarshaler for CustomDomainProperties struct. +func (cdp *CustomDomainProperties) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "hostName": + if v != nil { + var hostName string + err = json.Unmarshal(*v, &hostName) + if err != nil { + return err + } + cdp.HostName = &hostName + } + case "resourceState": + if v != nil { + var resourceState CustomDomainResourceState + err = json.Unmarshal(*v, &resourceState) + if err != nil { + return err + } + cdp.ResourceState = resourceState + } + case "customHttpsProvisioningState": + if v != nil { + var customHTTPSProvisioningState CustomHTTPSProvisioningState + err = json.Unmarshal(*v, &customHTTPSProvisioningState) + if err != nil { + return err + } + cdp.CustomHTTPSProvisioningState = customHTTPSProvisioningState + } + case "customHttpsProvisioningSubstate": + if v != nil { + var customHTTPSProvisioningSubstate CustomHTTPSProvisioningSubstate + err = json.Unmarshal(*v, &customHTTPSProvisioningSubstate) + if err != nil { + return err + } + cdp.CustomHTTPSProvisioningSubstate = customHTTPSProvisioningSubstate + } + case "customHttpsParameters": + if v != nil { + customHTTPSParameters, err := unmarshalBasicCustomDomainHTTPSParameters(*v) + if err != nil { + return err + } + cdp.CustomHTTPSParameters = customHTTPSParameters + } + case "validationData": + if v != nil { + var validationData string + err = json.Unmarshal(*v, &validationData) + if err != nil { + return err + } + cdp.ValidationData = &validationData + } + case "provisioningState": + if v != nil { + var provisioningState string + err = json.Unmarshal(*v, &provisioningState) + if err != nil { + return err + } + cdp.ProvisioningState = &provisioningState + } + } + } + + return nil +} + // CustomDomainPropertiesParameters the JSON object that contains the properties of the custom domain to // create. type CustomDomainPropertiesParameters struct { @@ -2668,6 +2748,92 @@ func (future *CustomDomainsDeleteFuture) result(client CustomDomainsClient) (cd return } +// CustomDomainsDisableCustomHTTPSFuture an abstraction for monitoring and retrieving the results of a +// long-running operation. +type CustomDomainsDisableCustomHTTPSFuture struct { + azure.FutureAPI + // Result returns the result of the asynchronous operation. + // If the operation has not completed it will return an error. + Result func(CustomDomainsClient) (CustomDomain, error) +} + +// UnmarshalJSON is the custom unmarshaller for CreateFuture. +func (future *CustomDomainsDisableCustomHTTPSFuture) UnmarshalJSON(body []byte) error { + var azFuture azure.Future + if err := json.Unmarshal(body, &azFuture); err != nil { + return err + } + future.FutureAPI = &azFuture + future.Result = future.result + return nil +} + +// result is the default implementation for CustomDomainsDisableCustomHTTPSFuture.Result. +func (future *CustomDomainsDisableCustomHTTPSFuture) result(client CustomDomainsClient) (cd CustomDomain, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "cdn.CustomDomainsDisableCustomHTTPSFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + cd.Response.Response = future.Response() + err = azure.NewAsyncOpIncompleteError("cdn.CustomDomainsDisableCustomHTTPSFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if cd.Response.Response, err = future.GetResult(sender); err == nil && cd.Response.Response.StatusCode != http.StatusNoContent { + cd, err = client.DisableCustomHTTPSResponder(cd.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "cdn.CustomDomainsDisableCustomHTTPSFuture", "Result", cd.Response.Response, "Failure responding to request") + } + } + return +} + +// CustomDomainsEnableCustomHTTPSFuture an abstraction for monitoring and retrieving the results of a +// long-running operation. +type CustomDomainsEnableCustomHTTPSFuture struct { + azure.FutureAPI + // Result returns the result of the asynchronous operation. + // If the operation has not completed it will return an error. + Result func(CustomDomainsClient) (CustomDomain, error) +} + +// UnmarshalJSON is the custom unmarshaller for CreateFuture. +func (future *CustomDomainsEnableCustomHTTPSFuture) UnmarshalJSON(body []byte) error { + var azFuture azure.Future + if err := json.Unmarshal(body, &azFuture); err != nil { + return err + } + future.FutureAPI = &azFuture + future.Result = future.result + return nil +} + +// result is the default implementation for CustomDomainsEnableCustomHTTPSFuture.Result. +func (future *CustomDomainsEnableCustomHTTPSFuture) result(client CustomDomainsClient) (cd CustomDomain, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "cdn.CustomDomainsEnableCustomHTTPSFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + cd.Response.Response = future.Response() + err = azure.NewAsyncOpIncompleteError("cdn.CustomDomainsEnableCustomHTTPSFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if cd.Response.Response, err = future.GetResult(sender); err == nil && cd.Response.Response.StatusCode != http.StatusNoContent { + cd, err = client.EnableCustomHTTPSResponder(cd.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "cdn.CustomDomainsEnableCustomHTTPSFuture", "Result", cd.Response.Response, "Failure responding to request") + } + } + return +} + // CustomerCertificate customer Certificate used for https type CustomerCertificate struct { // Version - Certificate version. @@ -2700,13 +2866,13 @@ type CustomerCertificateParameters struct { UseLatestVersion *bool `json:"useLatestVersion,omitempty"` // SubjectAlternativeNames - The list of SANs. SubjectAlternativeNames *[]string `json:"subjectAlternativeNames,omitempty"` - // Type - Possible values include: 'TypeSecretParameters', 'TypeURLSigningKey', 'TypeManagedCertificate', 'TypeCustomerCertificate' + // Type - Possible values include: 'TypeBasicSecretParametersTypeSecretParameters', 'TypeBasicSecretParametersTypeURLSigningKey', 'TypeBasicSecretParametersTypeManagedCertificate', 'TypeBasicSecretParametersTypeCustomerCertificate' Type TypeBasicSecretParameters `json:"type,omitempty"` } // MarshalJSON is the custom marshaler for CustomerCertificateParameters. func (ccp CustomerCertificateParameters) MarshalJSON() ([]byte, error) { - ccp.Type = TypeCustomerCertificate + ccp.Type = TypeBasicSecretParametersTypeCustomerCertificate objectMap := make(map[string]interface{}) if ccp.SecretSource != nil { objectMap["secretSource"] = ccp.SecretSource @@ -2758,13 +2924,13 @@ func (ccp CustomerCertificateParameters) AsBasicSecretParameters() (BasicSecretP type CustomRule struct { // Name - Defines the name of the custom rule Name *string `json:"name,omitempty"` - // EnabledState - Describes if the custom rule is in enabled or disabled state. Defaults to Enabled if not specified. Possible values include: 'Disabled', 'Enabled' + // EnabledState - Describes if the custom rule is in enabled or disabled state. Defaults to Enabled if not specified. Possible values include: 'CustomRuleEnabledStateDisabled', 'CustomRuleEnabledStateEnabled' EnabledState CustomRuleEnabledState `json:"enabledState,omitempty"` // Priority - Defines in what order this rule be evaluated in the overall list of custom rules Priority *int32 `json:"priority,omitempty"` // MatchConditions - List of match conditions. MatchConditions *[]MatchCondition `json:"matchConditions,omitempty"` - // Action - Describes what action to be applied when rule matches. Possible values include: 'Allow', 'Block', 'Log', 'Redirect' + // Action - Describes what action to be applied when rule matches. Possible values include: 'ActionTypeAllow', 'ActionTypeBlock', 'ActionTypeLog', 'ActionTypeRedirect' Action ActionType `json:"action,omitempty"` } @@ -2993,7 +3159,7 @@ type BasicDeliveryRuleAction interface { // DeliveryRuleAction an action for the delivery rule. type DeliveryRuleAction struct { - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLSigning', 'NameOriginGroupOverride', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameBasicDeliveryRuleActionNameDeliveryRuleAction', 'NameBasicDeliveryRuleActionNameURLRedirect', 'NameBasicDeliveryRuleActionNameURLSigning', 'NameBasicDeliveryRuleActionNameOriginGroupOverride', 'NameBasicDeliveryRuleActionNameURLRewrite', 'NameBasicDeliveryRuleActionNameModifyRequestHeader', 'NameBasicDeliveryRuleActionNameModifyResponseHeader', 'NameBasicDeliveryRuleActionNameCacheExpiration', 'NameBasicDeliveryRuleActionNameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } @@ -3005,35 +3171,35 @@ func unmarshalBasicDeliveryRuleAction(body []byte) (BasicDeliveryRuleAction, err } switch m["name"] { - case string(NameURLRedirect): + case string(NameBasicDeliveryRuleActionNameURLRedirect): var ura URLRedirectAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameURLSigning): + case string(NameBasicDeliveryRuleActionNameURLSigning): var usa URLSigningAction err := json.Unmarshal(body, &usa) return usa, err - case string(NameOriginGroupOverride): + case string(NameBasicDeliveryRuleActionNameOriginGroupOverride): var ogoa OriginGroupOverrideAction err := json.Unmarshal(body, &ogoa) return ogoa, err - case string(NameURLRewrite): + case string(NameBasicDeliveryRuleActionNameURLRewrite): var ura URLRewriteAction err := json.Unmarshal(body, &ura) return ura, err - case string(NameModifyRequestHeader): + case string(NameBasicDeliveryRuleActionNameModifyRequestHeader): var drrha DeliveryRuleRequestHeaderAction err := json.Unmarshal(body, &drrha) return drrha, err - case string(NameModifyResponseHeader): + case string(NameBasicDeliveryRuleActionNameModifyResponseHeader): var drrha DeliveryRuleResponseHeaderAction err := json.Unmarshal(body, &drrha) return drrha, err - case string(NameCacheExpiration): + case string(NameBasicDeliveryRuleActionNameCacheExpiration): var drcea DeliveryRuleCacheExpirationAction err := json.Unmarshal(body, &drcea) return drcea, err - case string(NameCacheKeyQueryString): + case string(NameBasicDeliveryRuleActionNameCacheKeyQueryString): var drckqsa DeliveryRuleCacheKeyQueryStringAction err := json.Unmarshal(body, &drckqsa) return drckqsa, err @@ -3064,7 +3230,7 @@ func unmarshalBasicDeliveryRuleActionArray(body []byte) ([]BasicDeliveryRuleActi // MarshalJSON is the custom marshaler for DeliveryRuleAction. func (dra DeliveryRuleAction) MarshalJSON() ([]byte, error) { - dra.Name = NameDeliveryRuleAction + dra.Name = NameBasicDeliveryRuleActionNameDeliveryRuleAction objectMap := make(map[string]interface{}) if dra.Name != "" { objectMap["name"] = dra.Name @@ -3126,13 +3292,13 @@ func (dra DeliveryRuleAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleActi type DeliveryRuleCacheExpirationAction struct { // Parameters - Defines the parameters for the action. Parameters *CacheExpirationActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLSigning', 'NameOriginGroupOverride', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameBasicDeliveryRuleActionNameDeliveryRuleAction', 'NameBasicDeliveryRuleActionNameURLRedirect', 'NameBasicDeliveryRuleActionNameURLSigning', 'NameBasicDeliveryRuleActionNameOriginGroupOverride', 'NameBasicDeliveryRuleActionNameURLRewrite', 'NameBasicDeliveryRuleActionNameModifyRequestHeader', 'NameBasicDeliveryRuleActionNameModifyResponseHeader', 'NameBasicDeliveryRuleActionNameCacheExpiration', 'NameBasicDeliveryRuleActionNameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } // MarshalJSON is the custom marshaler for DeliveryRuleCacheExpirationAction. func (drcea DeliveryRuleCacheExpirationAction) MarshalJSON() ([]byte, error) { - drcea.Name = NameCacheExpiration + drcea.Name = NameBasicDeliveryRuleActionNameCacheExpiration objectMap := make(map[string]interface{}) if drcea.Parameters != nil { objectMap["parameters"] = drcea.Parameters @@ -3197,13 +3363,13 @@ func (drcea DeliveryRuleCacheExpirationAction) AsBasicDeliveryRuleAction() (Basi type DeliveryRuleCacheKeyQueryStringAction struct { // Parameters - Defines the parameters for the action. Parameters *CacheKeyQueryStringActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLSigning', 'NameOriginGroupOverride', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameBasicDeliveryRuleActionNameDeliveryRuleAction', 'NameBasicDeliveryRuleActionNameURLRedirect', 'NameBasicDeliveryRuleActionNameURLSigning', 'NameBasicDeliveryRuleActionNameOriginGroupOverride', 'NameBasicDeliveryRuleActionNameURLRewrite', 'NameBasicDeliveryRuleActionNameModifyRequestHeader', 'NameBasicDeliveryRuleActionNameModifyResponseHeader', 'NameBasicDeliveryRuleActionNameCacheExpiration', 'NameBasicDeliveryRuleActionNameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } // MarshalJSON is the custom marshaler for DeliveryRuleCacheKeyQueryStringAction. func (drckqsa DeliveryRuleCacheKeyQueryStringAction) MarshalJSON() ([]byte, error) { - drckqsa.Name = NameCacheKeyQueryString + drckqsa.Name = NameBasicDeliveryRuleActionNameCacheKeyQueryString objectMap := make(map[string]interface{}) if drckqsa.Parameters != nil { objectMap["parameters"] = drckqsa.Parameters @@ -4179,13 +4345,13 @@ func (drrbc DeliveryRuleRequestBodyCondition) AsBasicDeliveryRuleCondition() (Ba type DeliveryRuleRequestHeaderAction struct { // Parameters - Defines the parameters for the action. Parameters *HeaderActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLSigning', 'NameOriginGroupOverride', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameBasicDeliveryRuleActionNameDeliveryRuleAction', 'NameBasicDeliveryRuleActionNameURLRedirect', 'NameBasicDeliveryRuleActionNameURLSigning', 'NameBasicDeliveryRuleActionNameOriginGroupOverride', 'NameBasicDeliveryRuleActionNameURLRewrite', 'NameBasicDeliveryRuleActionNameModifyRequestHeader', 'NameBasicDeliveryRuleActionNameModifyResponseHeader', 'NameBasicDeliveryRuleActionNameCacheExpiration', 'NameBasicDeliveryRuleActionNameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } // MarshalJSON is the custom marshaler for DeliveryRuleRequestHeaderAction. func (drrha DeliveryRuleRequestHeaderAction) MarshalJSON() ([]byte, error) { - drrha.Name = NameModifyRequestHeader + drrha.Name = NameBasicDeliveryRuleActionNameModifyRequestHeader objectMap := make(map[string]interface{}) if drrha.Parameters != nil { objectMap["parameters"] = drrha.Parameters @@ -4654,13 +4820,13 @@ func (drruc DeliveryRuleRequestURICondition) AsBasicDeliveryRuleCondition() (Bas type DeliveryRuleResponseHeaderAction struct { // Parameters - Defines the parameters for the action. Parameters *HeaderActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLSigning', 'NameOriginGroupOverride', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameBasicDeliveryRuleActionNameDeliveryRuleAction', 'NameBasicDeliveryRuleActionNameURLRedirect', 'NameBasicDeliveryRuleActionNameURLSigning', 'NameBasicDeliveryRuleActionNameOriginGroupOverride', 'NameBasicDeliveryRuleActionNameURLRewrite', 'NameBasicDeliveryRuleActionNameModifyRequestHeader', 'NameBasicDeliveryRuleActionNameModifyResponseHeader', 'NameBasicDeliveryRuleActionNameCacheExpiration', 'NameBasicDeliveryRuleActionNameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } // MarshalJSON is the custom marshaler for DeliveryRuleResponseHeaderAction. func (drrha DeliveryRuleResponseHeaderAction) MarshalJSON() ([]byte, error) { - drrha.Name = NameModifyResponseHeader + drrha.Name = NameBasicDeliveryRuleActionNameModifyResponseHeader objectMap := make(map[string]interface{}) if drrha.Parameters != nil { objectMap["parameters"] = drrha.Parameters @@ -5041,14 +5207,14 @@ func (dvp DomainValidationProperties) MarshalJSON() ([]byte, error) { // EdgeNode edgenode is a global Point of Presence (POP) location used to deliver CDN content to end users. type EdgeNode struct { *EdgeNodeProperties `json:"properties,omitempty"` - // SystemData - READ-ONLY - SystemData *SystemData `json:"systemData,omitempty"` // ID - READ-ONLY; Resource ID. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for EdgeNode. @@ -5078,15 +5244,6 @@ func (en *EdgeNode) UnmarshalJSON(body []byte) error { } en.EdgeNodeProperties = &edgeNodeProperties } - case "systemData": - if v != nil { - var systemData SystemData - err = json.Unmarshal(*v, &systemData) - if err != nil { - return err - } - en.SystemData = &systemData - } case "id": if v != nil { var ID string @@ -5114,6 +5271,15 @@ func (en *EdgeNode) UnmarshalJSON(body []byte) error { } en.Type = &typeVar } + case "systemData": + if v != nil { + var systemData SystemData + err = json.Unmarshal(*v, &systemData) + if err != nil { + return err + } + en.SystemData = &systemData + } } } @@ -5305,14 +5471,14 @@ type Endpoint struct { Location *string `json:"location,omitempty"` // Tags - Resource tags. Tags map[string]*string `json:"tags"` - // SystemData - READ-ONLY - SystemData *SystemData `json:"systemData,omitempty"` // ID - READ-ONLY; Resource ID. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for Endpoint. @@ -5366,15 +5532,6 @@ func (e *Endpoint) UnmarshalJSON(body []byte) error { } e.Tags = tags } - case "systemData": - if v != nil { - var systemData SystemData - err = json.Unmarshal(*v, &systemData) - if err != nil { - return err - } - e.SystemData = &systemData - } case "id": if v != nil { var ID string @@ -5402,6 +5559,15 @@ func (e *Endpoint) UnmarshalJSON(body []byte) error { } e.Type = &typeVar } + case "systemData": + if v != nil { + var systemData SystemData + err = json.Unmarshal(*v, &systemData) + if err != nil { + return err + } + e.SystemData = &systemData + } } } @@ -5603,7 +5769,7 @@ type EndpointProperties struct { IsHTTPSAllowed *bool `json:"isHttpsAllowed,omitempty"` // QueryStringCachingBehavior - Defines how CDN caches requests that include query strings. You can ignore any query strings when caching, bypass caching to prevent requests that contain query strings from being cached, or cache every request with a unique URL. Possible values include: 'QueryStringCachingBehaviorIgnoreQueryString', 'QueryStringCachingBehaviorBypassCaching', 'QueryStringCachingBehaviorUseQueryString', 'QueryStringCachingBehaviorNotSet' QueryStringCachingBehavior QueryStringCachingBehavior `json:"queryStringCachingBehavior,omitempty"` - // OptimizationType - Specifies what scenario the customer wants this CDN endpoint to optimize for, e.g. Download, Media services. With this information, CDN can apply scenario driven optimization. Possible values include: 'GeneralWebDelivery', 'GeneralMediaStreaming', 'VideoOnDemandMediaStreaming', 'LargeFileDownload', 'DynamicSiteAcceleration' + // OptimizationType - Specifies what scenario the customer wants this CDN endpoint to optimize for, e.g. Download, Media services. With this information, CDN can apply scenario driven optimization. Possible values include: 'OptimizationTypeGeneralWebDelivery', 'OptimizationTypeGeneralMediaStreaming', 'OptimizationTypeVideoOnDemandMediaStreaming', 'OptimizationTypeLargeFileDownload', 'OptimizationTypeDynamicSiteAcceleration' OptimizationType OptimizationType `json:"optimizationType,omitempty"` // ProbePath - Path to a file hosted on the origin which helps accelerate delivery of the dynamic content and calculate the most optimal routes for the CDN. This is relative to the origin path. This property is only relevant when using a single origin. ProbePath *string `json:"probePath,omitempty"` @@ -5689,7 +5855,7 @@ type EndpointPropertiesUpdateParameters struct { IsHTTPSAllowed *bool `json:"isHttpsAllowed,omitempty"` // QueryStringCachingBehavior - Defines how CDN caches requests that include query strings. You can ignore any query strings when caching, bypass caching to prevent requests that contain query strings from being cached, or cache every request with a unique URL. Possible values include: 'QueryStringCachingBehaviorIgnoreQueryString', 'QueryStringCachingBehaviorBypassCaching', 'QueryStringCachingBehaviorUseQueryString', 'QueryStringCachingBehaviorNotSet' QueryStringCachingBehavior QueryStringCachingBehavior `json:"queryStringCachingBehavior,omitempty"` - // OptimizationType - Specifies what scenario the customer wants this CDN endpoint to optimize for, e.g. Download, Media services. With this information, CDN can apply scenario driven optimization. Possible values include: 'GeneralWebDelivery', 'GeneralMediaStreaming', 'VideoOnDemandMediaStreaming', 'LargeFileDownload', 'DynamicSiteAcceleration' + // OptimizationType - Specifies what scenario the customer wants this CDN endpoint to optimize for, e.g. Download, Media services. With this information, CDN can apply scenario driven optimization. Possible values include: 'OptimizationTypeGeneralWebDelivery', 'OptimizationTypeGeneralMediaStreaming', 'OptimizationTypeVideoOnDemandMediaStreaming', 'OptimizationTypeLargeFileDownload', 'OptimizationTypeDynamicSiteAcceleration' OptimizationType OptimizationType `json:"optimizationType,omitempty"` // ProbePath - Path to a file hosted on the origin which helps accelerate delivery of the dynamic content and calculate the most optimal routes for the CDN. This is relative to the origin path. This property is only relevant when using a single origin. ProbePath *string `json:"probePath,omitempty"` @@ -6090,7 +6256,7 @@ type GeoFilter struct { // HeaderActionParameters defines the parameters for the request header action. type HeaderActionParameters struct { OdataType *string `json:"@odata.type,omitempty"` - // HeaderAction - Action to perform. Possible values include: 'Append', 'Overwrite', 'Delete' + // HeaderAction - Action to perform. Possible values include: 'HeaderActionAppend', 'HeaderActionOverwrite', 'HeaderActionDelete' HeaderAction HeaderAction `json:"headerAction,omitempty"` // HeaderName - Name of the header to modify HeaderName *string `json:"headerName,omitempty"` @@ -6215,13 +6381,13 @@ type ManagedCertificate struct { // ManagedCertificateParameters managed Certificate used for https type ManagedCertificateParameters struct { - // Type - Possible values include: 'TypeSecretParameters', 'TypeURLSigningKey', 'TypeManagedCertificate', 'TypeCustomerCertificate' + // Type - Possible values include: 'TypeBasicSecretParametersTypeSecretParameters', 'TypeBasicSecretParametersTypeURLSigningKey', 'TypeBasicSecretParametersTypeManagedCertificate', 'TypeBasicSecretParametersTypeCustomerCertificate' Type TypeBasicSecretParameters `json:"type,omitempty"` } // MarshalJSON is the custom marshaler for ManagedCertificateParameters. func (mcp ManagedCertificateParameters) MarshalJSON() ([]byte, error) { - mcp.Type = TypeManagedCertificate + mcp.Type = TypeBasicSecretParametersTypeManagedCertificate objectMap := make(map[string]interface{}) if mcp.Type != "" { objectMap["type"] = mcp.Type @@ -6259,7 +6425,7 @@ func (mcp ManagedCertificateParameters) AsBasicSecretParameters() (BasicSecretPa type ManagedHTTPSParameters struct { // CertificateSourceParameters - Defines the certificate source parameters using CDN managed certificate for enabling SSL. CertificateSourceParameters *CertificateSourceParameters `json:"certificateSourceParameters,omitempty"` - // ProtocolType - Defines the TLS extension protocol that is used for secure delivery. Possible values include: 'ServerNameIndication', 'IPBased' + // ProtocolType - Defines the TLS extension protocol that is used for secure delivery. Possible values include: 'ProtocolTypeServerNameIndication', 'ProtocolTypeIPBased' ProtocolType ProtocolType `json:"protocolType,omitempty"` // MinimumTLSVersion - TLS protocol version that will be used for Https. Possible values include: 'MinimumTLSVersionNone', 'MinimumTLSVersionTLS10', 'MinimumTLSVersionTLS12' MinimumTLSVersion MinimumTLSVersion `json:"minimumTlsVersion,omitempty"` @@ -6350,7 +6516,7 @@ type ManagedRuleOverride struct { RuleID *string `json:"ruleId,omitempty"` // EnabledState - Describes if the managed rule is in enabled or disabled state. Defaults to Disabled if not specified. Possible values include: 'ManagedRuleEnabledStateDisabled', 'ManagedRuleEnabledStateEnabled' EnabledState ManagedRuleEnabledState `json:"enabledState,omitempty"` - // Action - Describes the override action to be applied when rule matches. Possible values include: 'Allow', 'Block', 'Log', 'Redirect' + // Action - Describes the override action to be applied when rule matches. Possible values include: 'ActionTypeAllow', 'ActionTypeBlock', 'ActionTypeLog', 'ActionTypeRedirect' Action ActionType `json:"action,omitempty"` } @@ -6378,6 +6544,8 @@ type ManagedRuleSetDefinition struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for ManagedRuleSetDefinition. @@ -6446,6 +6614,15 @@ func (mrsd *ManagedRuleSetDefinition) UnmarshalJSON(body []byte) error { } mrsd.Type = &typeVar } + case "systemData": + if v != nil { + var systemData SystemData + err = json.Unmarshal(*v, &systemData) + if err != nil { + return err + } + mrsd.SystemData = &systemData + } } } @@ -6647,7 +6824,7 @@ type ManagedRuleSetList struct { // MatchCondition define match conditions type MatchCondition struct { - // MatchVariable - Match variable to compare against. Possible values include: 'RemoteAddr', 'SocketAddr', 'RequestMethod', 'RequestHeader', 'RequestURI', 'QueryString', 'RequestBody', 'Cookies', 'PostArgs' + // MatchVariable - Match variable to compare against. Possible values include: 'MatchVariableRemoteAddr', 'MatchVariableSocketAddr', 'MatchVariableRequestMethod', 'MatchVariableRequestHeader', 'MatchVariableRequestURI', 'MatchVariableQueryString', 'MatchVariableRequestBody', 'MatchVariableCookies', 'MatchVariablePostArgs' MatchVariable MatchVariable `json:"matchVariable,omitempty"` // Selector - Selector can used to match a specific key for QueryString, Cookies, RequestHeader or PostArgs. Selector *string `json:"selector,omitempty"` @@ -6666,7 +6843,7 @@ type MetricsResponse struct { autorest.Response `json:"-"` DateTimeBegin *date.Time `json:"dateTimeBegin,omitempty"` DateTimeEnd *date.Time `json:"dateTimeEnd,omitempty"` - // Granularity - Possible values include: 'PT5M', 'PT1H', 'P1D' + // Granularity - Possible values include: 'GranularityPT5M', 'GranularityPT1H', 'GranularityP1D' Granularity Granularity `json:"granularity,omitempty"` Series *[]MetricsResponseSeriesItem `json:"series,omitempty"` } @@ -6674,7 +6851,7 @@ type MetricsResponse struct { // MetricsResponseSeriesItem ... type MetricsResponseSeriesItem struct { Metric *string `json:"metric,omitempty"` - // Unit - Possible values include: 'Count', 'Bytes', 'BitsPerSecond' + // Unit - Possible values include: 'UnitCount', 'UnitBytes', 'UnitBitsPerSecond' Unit Unit `json:"unit,omitempty"` Groups *[]MetricsResponseSeriesItemGroupsItem `json:"groups,omitempty"` Data *[]MetricsResponseSeriesItemDataItem `json:"data,omitempty"` @@ -6900,14 +7077,14 @@ func NewOperationsListResultPage(cur OperationsListResult, getNextPage func(cont type Origin struct { autorest.Response `json:"-"` *OriginProperties `json:"properties,omitempty"` - // SystemData - READ-ONLY - SystemData *SystemData `json:"systemData,omitempty"` // ID - READ-ONLY; Resource ID. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for Origin. @@ -6937,15 +7114,6 @@ func (o *Origin) UnmarshalJSON(body []byte) error { } o.OriginProperties = &originProperties } - case "systemData": - if v != nil { - var systemData SystemData - err = json.Unmarshal(*v, &systemData) - if err != nil { - return err - } - o.SystemData = &systemData - } case "id": if v != nil { var ID string @@ -6973,6 +7141,15 @@ func (o *Origin) UnmarshalJSON(body []byte) error { } o.Type = &typeVar } + case "systemData": + if v != nil { + var systemData SystemData + err = json.Unmarshal(*v, &systemData) + if err != nil { + return err + } + o.SystemData = &systemData + } } } @@ -6984,14 +7161,14 @@ func (o *Origin) UnmarshalJSON(body []byte) error { type OriginGroup struct { autorest.Response `json:"-"` *OriginGroupProperties `json:"properties,omitempty"` - // SystemData - READ-ONLY - SystemData *SystemData `json:"systemData,omitempty"` // ID - READ-ONLY; Resource ID. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for OriginGroup. @@ -7021,15 +7198,6 @@ func (og *OriginGroup) UnmarshalJSON(body []byte) error { } og.OriginGroupProperties = &originGroupProperties } - case "systemData": - if v != nil { - var systemData SystemData - err = json.Unmarshal(*v, &systemData) - if err != nil { - return err - } - og.SystemData = &systemData - } case "id": if v != nil { var ID string @@ -7057,6 +7225,15 @@ func (og *OriginGroup) UnmarshalJSON(body []byte) error { } og.Type = &typeVar } + case "systemData": + if v != nil { + var systemData SystemData + err = json.Unmarshal(*v, &systemData) + if err != nil { + return err + } + og.SystemData = &systemData + } } } @@ -7236,13 +7413,13 @@ func NewOriginGroupListResultPage(cur OriginGroupListResult, getNextPage func(co type OriginGroupOverrideAction struct { // Parameters - Defines the parameters for the action. Parameters *OriginGroupOverrideActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLSigning', 'NameOriginGroupOverride', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameBasicDeliveryRuleActionNameDeliveryRuleAction', 'NameBasicDeliveryRuleActionNameURLRedirect', 'NameBasicDeliveryRuleActionNameURLSigning', 'NameBasicDeliveryRuleActionNameOriginGroupOverride', 'NameBasicDeliveryRuleActionNameURLRewrite', 'NameBasicDeliveryRuleActionNameModifyRequestHeader', 'NameBasicDeliveryRuleActionNameModifyResponseHeader', 'NameBasicDeliveryRuleActionNameCacheExpiration', 'NameBasicDeliveryRuleActionNameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } // MarshalJSON is the custom marshaler for OriginGroupOverrideAction. func (ogoa OriginGroupOverrideAction) MarshalJSON() ([]byte, error) { - ogoa.Name = NameOriginGroupOverride + ogoa.Name = NameBasicDeliveryRuleActionNameOriginGroupOverride objectMap := make(map[string]interface{}) if ogoa.Parameters != nil { objectMap["parameters"] = ogoa.Parameters @@ -8034,7 +8211,7 @@ func (future *PoliciesUpdateFuture) result(client PoliciesClient) (wafp WebAppli type PolicySettings struct { // EnabledState - describes if the policy is in enabled state or disabled state. Possible values include: 'PolicyEnabledStateDisabled', 'PolicyEnabledStateEnabled' EnabledState PolicyEnabledState `json:"enabledState,omitempty"` - // Mode - Describes if it is in detection mode or prevention mode at policy level. Possible values include: 'Prevention', 'Detection' + // Mode - Describes if it is in detection mode or prevention mode at policy level. Possible values include: 'PolicyModePrevention', 'PolicyModeDetection' Mode PolicyMode `json:"mode,omitempty"` // DefaultRedirectURL - If action type is redirect, this field represents the default redirect URL for the client. DefaultRedirectURL *string `json:"defaultRedirectUrl,omitempty"` @@ -8070,14 +8247,14 @@ type Profile struct { Location *string `json:"location,omitempty"` // Tags - Resource tags. Tags map[string]*string `json:"tags"` - // SystemData - READ-ONLY - SystemData *SystemData `json:"systemData,omitempty"` // ID - READ-ONLY; Resource ID. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for Profile. @@ -8143,15 +8320,6 @@ func (p *Profile) UnmarshalJSON(body []byte) error { } p.Tags = tags } - case "systemData": - if v != nil { - var systemData SystemData - err = json.Unmarshal(*v, &systemData) - if err != nil { - return err - } - p.SystemData = &systemData - } case "id": if v != nil { var ID string @@ -8179,6 +8347,15 @@ func (p *Profile) UnmarshalJSON(body []byte) error { } p.Type = &typeVar } + case "systemData": + if v != nil { + var systemData SystemData + err = json.Unmarshal(*v, &systemData) + if err != nil { + return err + } + p.SystemData = &systemData + } } } @@ -8511,14 +8688,14 @@ func (pup ProfileUpdateParameters) MarshalJSON() ([]byte, error) { // ProxyResource the resource model definition for a ARM proxy resource. It will have everything other than // required location and tags type ProxyResource struct { - // SystemData - READ-ONLY - SystemData *SystemData `json:"systemData,omitempty"` // ID - READ-ONLY; Resource ID. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for ProxyResource. @@ -8581,13 +8758,13 @@ type RateLimitRule struct { RateLimitDurationInMinutes *int32 `json:"rateLimitDurationInMinutes,omitempty"` // Name - Defines the name of the custom rule Name *string `json:"name,omitempty"` - // EnabledState - Describes if the custom rule is in enabled or disabled state. Defaults to Enabled if not specified. Possible values include: 'Disabled', 'Enabled' + // EnabledState - Describes if the custom rule is in enabled or disabled state. Defaults to Enabled if not specified. Possible values include: 'CustomRuleEnabledStateDisabled', 'CustomRuleEnabledStateEnabled' EnabledState CustomRuleEnabledState `json:"enabledState,omitempty"` // Priority - Defines in what order this rule be evaluated in the overall list of custom rules Priority *int32 `json:"priority,omitempty"` // MatchConditions - List of match conditions. MatchConditions *[]MatchCondition `json:"matchConditions,omitempty"` - // Action - Describes what action to be applied when rule matches. Possible values include: 'Allow', 'Block', 'Log', 'Redirect' + // Action - Describes what action to be applied when rule matches. Possible values include: 'ActionTypeAllow', 'ActionTypeBlock', 'ActionTypeLog', 'ActionTypeRedirect' Action ActionType `json:"action,omitempty"` } @@ -8681,6 +8858,8 @@ type Resource struct { Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for Resource. @@ -8915,7 +9094,7 @@ func NewResourceUsageListResultPage(cur ResourceUsageListResult, getNextPage fun // ResponseBasedOriginErrorDetectionParameters the JSON object that contains the properties to determine // origin health using real requests/responses. type ResponseBasedOriginErrorDetectionParameters struct { - // ResponseBasedDetectedErrorTypes - Type of response errors for real user requests for which origin will be deemed unhealthy. Possible values include: 'None', 'TCPErrorsOnly', 'TCPAndHTTPErrors' + // ResponseBasedDetectedErrorTypes - Type of response errors for real user requests for which origin will be deemed unhealthy. Possible values include: 'ResponseBasedDetectedErrorTypesNone', 'ResponseBasedDetectedErrorTypesTCPErrorsOnly', 'ResponseBasedDetectedErrorTypesTCPAndHTTPErrors' ResponseBasedDetectedErrorTypes ResponseBasedDetectedErrorTypes `json:"responseBasedDetectedErrorTypes,omitempty"` // ResponseBasedFailoverThresholdPercentage - The percentage of failed requests in the sample where failover should trigger. ResponseBasedFailoverThresholdPercentage *int32 `json:"responseBasedFailoverThresholdPercentage,omitempty"` @@ -8927,14 +9106,14 @@ type ResponseBasedOriginErrorDetectionParameters struct { type Route struct { autorest.Response `json:"-"` *RouteProperties `json:"properties,omitempty"` - // SystemData - READ-ONLY - SystemData *SystemData `json:"systemData,omitempty"` // ID - READ-ONLY; Resource ID. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for Route. @@ -8964,15 +9143,6 @@ func (r *Route) UnmarshalJSON(body []byte) error { } r.RouteProperties = &routeProperties } - case "systemData": - if v != nil { - var systemData SystemData - err = json.Unmarshal(*v, &systemData) - if err != nil { - return err - } - r.SystemData = &systemData - } case "id": if v != nil { var ID string @@ -9000,6 +9170,15 @@ func (r *Route) UnmarshalJSON(body []byte) error { } r.Type = &typeVar } + case "systemData": + if v != nil { + var systemData SystemData + err = json.Unmarshal(*v, &systemData) + if err != nil { + return err + } + r.SystemData = &systemData + } } } @@ -9191,9 +9370,9 @@ type RouteProperties struct { PatternsToMatch *[]string `json:"patternsToMatch,omitempty"` // CompressionSettings - compression settings. CompressionSettings interface{} `json:"compressionSettings,omitempty"` - // QueryStringCachingBehavior - Defines how CDN caches requests that include query strings. You can ignore any query strings when caching, bypass caching to prevent requests that contain query strings from being cached, or cache every request with a unique URL. Possible values include: 'IgnoreQueryString', 'UseQueryString', 'NotSet' + // QueryStringCachingBehavior - Defines how CDN caches requests that include query strings. You can ignore any query strings when caching, bypass caching to prevent requests that contain query strings from being cached, or cache every request with a unique URL. Possible values include: 'AfdQueryStringCachingBehaviorIgnoreQueryString', 'AfdQueryStringCachingBehaviorUseQueryString', 'AfdQueryStringCachingBehaviorNotSet' QueryStringCachingBehavior AfdQueryStringCachingBehavior `json:"queryStringCachingBehavior,omitempty"` - // ForwardingProtocol - Protocol this rule will use when forwarding traffic to backends. Possible values include: 'HTTPOnly', 'HTTPSOnly', 'MatchRequest' + // ForwardingProtocol - Protocol this rule will use when forwarding traffic to backends. Possible values include: 'ForwardingProtocolHTTPOnly', 'ForwardingProtocolHTTPSOnly', 'ForwardingProtocolMatchRequest' ForwardingProtocol ForwardingProtocol `json:"forwardingProtocol,omitempty"` // LinkToDefaultDomain - whether this route will be linked to the default endpoint domain. Possible values include: 'LinkToDefaultDomainEnabled', 'LinkToDefaultDomainDisabled' LinkToDefaultDomain LinkToDefaultDomain `json:"linkToDefaultDomain,omitempty"` @@ -9201,7 +9380,7 @@ type RouteProperties struct { HTTPSRedirect HTTPSRedirect `json:"httpsRedirect,omitempty"` // EnabledState - Whether to enable use of this rule. Permitted values are 'Enabled' or 'Disabled'. Possible values include: 'EnabledStateEnabled', 'EnabledStateDisabled' EnabledState EnabledState `json:"enabledState,omitempty"` - // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'Succeeded', 'Failed', 'Updating', 'Deleting', 'Creating' + // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'AfdProvisioningStateSucceeded', 'AfdProvisioningStateFailed', 'AfdProvisioningStateUpdating', 'AfdProvisioningStateDeleting', 'AfdProvisioningStateCreating' ProvisioningState AfdProvisioningState `json:"provisioningState,omitempty"` // DeploymentStatus - READ-ONLY; Possible values include: 'DeploymentStatusNotStarted', 'DeploymentStatusInProgress', 'DeploymentStatusSucceeded', 'DeploymentStatusFailed' DeploymentStatus DeploymentStatus `json:"deploymentStatus,omitempty"` @@ -9423,9 +9602,9 @@ type RouteUpdatePropertiesParameters struct { PatternsToMatch *[]string `json:"patternsToMatch,omitempty"` // CompressionSettings - compression settings. CompressionSettings interface{} `json:"compressionSettings,omitempty"` - // QueryStringCachingBehavior - Defines how CDN caches requests that include query strings. You can ignore any query strings when caching, bypass caching to prevent requests that contain query strings from being cached, or cache every request with a unique URL. Possible values include: 'IgnoreQueryString', 'UseQueryString', 'NotSet' + // QueryStringCachingBehavior - Defines how CDN caches requests that include query strings. You can ignore any query strings when caching, bypass caching to prevent requests that contain query strings from being cached, or cache every request with a unique URL. Possible values include: 'AfdQueryStringCachingBehaviorIgnoreQueryString', 'AfdQueryStringCachingBehaviorUseQueryString', 'AfdQueryStringCachingBehaviorNotSet' QueryStringCachingBehavior AfdQueryStringCachingBehavior `json:"queryStringCachingBehavior,omitempty"` - // ForwardingProtocol - Protocol this rule will use when forwarding traffic to backends. Possible values include: 'HTTPOnly', 'HTTPSOnly', 'MatchRequest' + // ForwardingProtocol - Protocol this rule will use when forwarding traffic to backends. Possible values include: 'ForwardingProtocolHTTPOnly', 'ForwardingProtocolHTTPSOnly', 'ForwardingProtocolMatchRequest' ForwardingProtocol ForwardingProtocol `json:"forwardingProtocol,omitempty"` // LinkToDefaultDomain - whether this route will be linked to the default endpoint domain. Possible values include: 'LinkToDefaultDomainEnabled', 'LinkToDefaultDomainDisabled' LinkToDefaultDomain LinkToDefaultDomain `json:"linkToDefaultDomain,omitempty"` @@ -9439,14 +9618,14 @@ type RouteUpdatePropertiesParameters struct { type Rule struct { autorest.Response `json:"-"` *RuleProperties `json:"properties,omitempty"` - // SystemData - READ-ONLY - SystemData *SystemData `json:"systemData,omitempty"` // ID - READ-ONLY; Resource ID. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for Rule. @@ -9476,15 +9655,6 @@ func (r *Rule) UnmarshalJSON(body []byte) error { } r.RuleProperties = &ruleProperties } - case "systemData": - if v != nil { - var systemData SystemData - err = json.Unmarshal(*v, &systemData) - if err != nil { - return err - } - r.SystemData = &systemData - } case "id": if v != nil { var ID string @@ -9512,6 +9682,15 @@ func (r *Rule) UnmarshalJSON(body []byte) error { } r.Type = &typeVar } + case "systemData": + if v != nil { + var systemData SystemData + err = json.Unmarshal(*v, &systemData) + if err != nil { + return err + } + r.SystemData = &systemData + } } } @@ -9695,9 +9874,9 @@ type RuleProperties struct { Conditions *[]BasicDeliveryRuleCondition `json:"conditions,omitempty"` // Actions - A list of actions that are executed when all the conditions of a rule are satisfied. Actions *[]BasicDeliveryRuleAction `json:"actions,omitempty"` - // MatchProcessingBehavior - If this rule is a match should the rules engine continue running the remaining rules or stop. If not present, defaults to Continue. Possible values include: 'Continue', 'Stop' + // MatchProcessingBehavior - If this rule is a match should the rules engine continue running the remaining rules or stop. If not present, defaults to Continue. Possible values include: 'MatchProcessingBehaviorContinue', 'MatchProcessingBehaviorStop' MatchProcessingBehavior MatchProcessingBehavior `json:"matchProcessingBehavior,omitempty"` - // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'Succeeded', 'Failed', 'Updating', 'Deleting', 'Creating' + // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'AfdProvisioningStateSucceeded', 'AfdProvisioningStateFailed', 'AfdProvisioningStateUpdating', 'AfdProvisioningStateDeleting', 'AfdProvisioningStateCreating' ProvisioningState AfdProvisioningState `json:"provisioningState,omitempty"` // DeploymentStatus - READ-ONLY; Possible values include: 'DeploymentStatusNotStarted', 'DeploymentStatusInProgress', 'DeploymentStatusSucceeded', 'DeploymentStatusFailed' DeploymentStatus DeploymentStatus `json:"deploymentStatus,omitempty"` @@ -9870,14 +10049,14 @@ func (future *RulesDeleteFuture) result(client RulesClient) (ar autorest.Respons type RuleSet struct { autorest.Response `json:"-"` *RuleSetProperties `json:"properties,omitempty"` - // SystemData - READ-ONLY - SystemData *SystemData `json:"systemData,omitempty"` // ID - READ-ONLY; Resource ID. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for RuleSet. @@ -9907,15 +10086,6 @@ func (rs *RuleSet) UnmarshalJSON(body []byte) error { } rs.RuleSetProperties = &ruleSetProperties } - case "systemData": - if v != nil { - var systemData SystemData - err = json.Unmarshal(*v, &systemData) - if err != nil { - return err - } - rs.SystemData = &systemData - } case "id": if v != nil { var ID string @@ -9943,6 +10113,15 @@ func (rs *RuleSet) UnmarshalJSON(body []byte) error { } rs.Type = &typeVar } + case "systemData": + if v != nil { + var systemData SystemData + err = json.Unmarshal(*v, &systemData) + if err != nil { + return err + } + rs.SystemData = &systemData + } } } @@ -10120,7 +10299,7 @@ func NewRuleSetListResultPage(cur RuleSetListResult, getNextPage func(context.Co // RuleSetProperties the JSON object that contains the properties of the Rule Set to create. type RuleSetProperties struct { - // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'Succeeded', 'Failed', 'Updating', 'Deleting', 'Creating' + // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'AfdProvisioningStateSucceeded', 'AfdProvisioningStateFailed', 'AfdProvisioningStateUpdating', 'AfdProvisioningStateDeleting', 'AfdProvisioningStateCreating' ProvisioningState AfdProvisioningState `json:"provisioningState,omitempty"` // DeploymentStatus - READ-ONLY; Possible values include: 'DeploymentStatusNotStarted', 'DeploymentStatusInProgress', 'DeploymentStatusSucceeded', 'DeploymentStatusFailed' DeploymentStatus DeploymentStatus `json:"deploymentStatus,omitempty"` @@ -10300,7 +10479,7 @@ type RuleUpdatePropertiesParameters struct { Conditions *[]BasicDeliveryRuleCondition `json:"conditions,omitempty"` // Actions - A list of actions that are executed when all the conditions of a rule are satisfied. Actions *[]BasicDeliveryRuleAction `json:"actions,omitempty"` - // MatchProcessingBehavior - If this rule is a match should the rules engine continue running the remaining rules or stop. If not present, defaults to Continue. Possible values include: 'Continue', 'Stop' + // MatchProcessingBehavior - If this rule is a match should the rules engine continue running the remaining rules or stop. If not present, defaults to Continue. Possible values include: 'MatchProcessingBehaviorContinue', 'MatchProcessingBehaviorStop' MatchProcessingBehavior MatchProcessingBehavior `json:"matchProcessingBehavior,omitempty"` } @@ -10357,14 +10536,14 @@ func (rupp *RuleUpdatePropertiesParameters) UnmarshalJSON(body []byte) error { type Secret struct { autorest.Response `json:"-"` *SecretProperties `json:"properties,omitempty"` - // SystemData - READ-ONLY - SystemData *SystemData `json:"systemData,omitempty"` // ID - READ-ONLY; Resource ID. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for Secret. @@ -10394,15 +10573,6 @@ func (s *Secret) UnmarshalJSON(body []byte) error { } s.SecretProperties = &secretProperties } - case "systemData": - if v != nil { - var systemData SystemData - err = json.Unmarshal(*v, &systemData) - if err != nil { - return err - } - s.SystemData = &systemData - } case "id": if v != nil { var ID string @@ -10430,6 +10600,15 @@ func (s *Secret) UnmarshalJSON(body []byte) error { } s.Type = &typeVar } + case "systemData": + if v != nil { + var systemData SystemData + err = json.Unmarshal(*v, &systemData) + if err != nil { + return err + } + s.SystemData = &systemData + } } } @@ -10615,7 +10794,7 @@ type BasicSecretParameters interface { // SecretParameters the json object containing secret parameters type SecretParameters struct { - // Type - Possible values include: 'TypeSecretParameters', 'TypeURLSigningKey', 'TypeManagedCertificate', 'TypeCustomerCertificate' + // Type - Possible values include: 'TypeBasicSecretParametersTypeSecretParameters', 'TypeBasicSecretParametersTypeURLSigningKey', 'TypeBasicSecretParametersTypeManagedCertificate', 'TypeBasicSecretParametersTypeCustomerCertificate' Type TypeBasicSecretParameters `json:"type,omitempty"` } @@ -10627,15 +10806,15 @@ func unmarshalBasicSecretParameters(body []byte) (BasicSecretParameters, error) } switch m["type"] { - case string(TypeURLSigningKey): + case string(TypeBasicSecretParametersTypeURLSigningKey): var uskp URLSigningKeyParameters err := json.Unmarshal(body, &uskp) return uskp, err - case string(TypeManagedCertificate): + case string(TypeBasicSecretParametersTypeManagedCertificate): var mcp ManagedCertificateParameters err := json.Unmarshal(body, &mcp) return mcp, err - case string(TypeCustomerCertificate): + case string(TypeBasicSecretParametersTypeCustomerCertificate): var ccp CustomerCertificateParameters err := json.Unmarshal(body, &ccp) return ccp, err @@ -10666,7 +10845,7 @@ func unmarshalBasicSecretParametersArray(body []byte) ([]BasicSecretParameters, // MarshalJSON is the custom marshaler for SecretParameters. func (sp SecretParameters) MarshalJSON() ([]byte, error) { - sp.Type = TypeSecretParameters + sp.Type = TypeBasicSecretParametersTypeSecretParameters objectMap := make(map[string]interface{}) if sp.Type != "" { objectMap["type"] = sp.Type @@ -10703,7 +10882,7 @@ func (sp SecretParameters) AsBasicSecretParameters() (BasicSecretParameters, boo type SecretProperties struct { // Parameters - object which contains secret parameters Parameters BasicSecretParameters `json:"parameters,omitempty"` - // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'Succeeded', 'Failed', 'Updating', 'Deleting', 'Creating' + // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'AfdProvisioningStateSucceeded', 'AfdProvisioningStateFailed', 'AfdProvisioningStateUpdating', 'AfdProvisioningStateDeleting', 'AfdProvisioningStateCreating' ProvisioningState AfdProvisioningState `json:"provisioningState,omitempty"` // DeploymentStatus - READ-ONLY; Possible values include: 'DeploymentStatusNotStarted', 'DeploymentStatusInProgress', 'DeploymentStatusSucceeded', 'DeploymentStatusFailed' DeploymentStatus DeploymentStatus `json:"deploymentStatus,omitempty"` @@ -11007,14 +11186,14 @@ func (future *SecurityPoliciesPatchFuture) result(client SecurityPoliciesClient) type SecurityPolicy struct { autorest.Response `json:"-"` *SecurityPolicyProperties `json:"properties,omitempty"` - // SystemData - READ-ONLY - SystemData *SystemData `json:"systemData,omitempty"` // ID - READ-ONLY; Resource ID. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for SecurityPolicy. @@ -11044,15 +11223,6 @@ func (sp *SecurityPolicy) UnmarshalJSON(body []byte) error { } sp.SecurityPolicyProperties = &securityPolicyProperties } - case "systemData": - if v != nil { - var systemData SystemData - err = json.Unmarshal(*v, &systemData) - if err != nil { - return err - } - sp.SystemData = &systemData - } case "id": if v != nil { var ID string @@ -11080,6 +11250,15 @@ func (sp *SecurityPolicy) UnmarshalJSON(body []byte) error { } sp.Type = &typeVar } + case "systemData": + if v != nil { + var systemData SystemData + err = json.Unmarshal(*v, &systemData) + if err != nil { + return err + } + sp.SystemData = &systemData + } } } @@ -11333,7 +11512,7 @@ func (spp SecurityPolicyParameters) AsBasicSecurityPolicyParameters() (BasicSecu type SecurityPolicyProperties struct { // Parameters - object which contains security policy parameters Parameters BasicSecurityPolicyParameters `json:"parameters,omitempty"` - // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'Succeeded', 'Failed', 'Updating', 'Deleting', 'Creating' + // ProvisioningState - READ-ONLY; Provisioning status. Possible values include: 'AfdProvisioningStateSucceeded', 'AfdProvisioningStateFailed', 'AfdProvisioningStateUpdating', 'AfdProvisioningStateDeleting', 'AfdProvisioningStateCreating' ProvisioningState AfdProvisioningState `json:"provisioningState,omitempty"` // DeploymentStatus - READ-ONLY; Possible values include: 'DeploymentStatusNotStarted', 'DeploymentStatusInProgress', 'DeploymentStatusSucceeded', 'DeploymentStatusFailed' DeploymentStatus DeploymentStatus `json:"deploymentStatus,omitempty"` @@ -11453,7 +11632,7 @@ type SharedPrivateLinkResourceProperties struct { // Sku the pricing tier (defines a CDN provider, feature list and rate) of the CDN profile. type Sku struct { - // Name - Name of the pricing tier. Possible values include: 'StandardVerizon', 'PremiumVerizon', 'CustomVerizon', 'StandardAkamai', 'StandardChinaCdn', 'StandardMicrosoft', 'PremiumChinaCdn', 'StandardAzureFrontDoor', 'PremiumAzureFrontDoor', 'Standard955BandWidthChinaCdn', 'StandardAvgBandWidthChinaCdn', 'StandardPlusChinaCdn', 'StandardPlus955BandWidthChinaCdn', 'StandardPlusAvgBandWidthChinaCdn' + // Name - Name of the pricing tier. Possible values include: 'SkuNameStandardVerizon', 'SkuNamePremiumVerizon', 'SkuNameCustomVerizon', 'SkuNameStandardAkamai', 'SkuNameStandardChinaCdn', 'SkuNameStandardMicrosoft', 'SkuNamePremiumChinaCdn', 'SkuNameStandardAzureFrontDoor', 'SkuNamePremiumAzureFrontDoor', 'SkuNameStandard955BandWidthChinaCdn', 'SkuNameStandardAvgBandWidthChinaCdn', 'SkuNameStandardPlusChinaCdn', 'SkuNameStandardPlus955BandWidthChinaCdn', 'SkuNameStandardPlusAvgBandWidthChinaCdn' Name SkuName `json:"name,omitempty"` } @@ -11487,13 +11666,13 @@ func (sotlr SupportedOptimizationTypesListResult) MarshalJSON() ([]byte, error) type SystemData struct { // CreatedBy - An identifier for the identity that created the resource CreatedBy *string `json:"createdBy,omitempty"` - // CreatedByType - The type of identity that created the resource. Possible values include: 'User', 'Application', 'ManagedIdentity', 'Key' + // CreatedByType - The type of identity that created the resource. Possible values include: 'IdentityTypeUser', 'IdentityTypeApplication', 'IdentityTypeManagedIdentity', 'IdentityTypeKey' CreatedByType IdentityType `json:"createdByType,omitempty"` // CreatedAt - The timestamp of resource creation (UTC) CreatedAt *date.Time `json:"createdAt,omitempty"` // LastModifiedBy - An identifier for the identity that last modified the resource LastModifiedBy *string `json:"lastModifiedBy,omitempty"` - // LastModifiedByType - The type of identity that last modified the resource. Possible values include: 'User', 'Application', 'ManagedIdentity', 'Key' + // LastModifiedByType - The type of identity that last modified the resource. Possible values include: 'IdentityTypeUser', 'IdentityTypeApplication', 'IdentityTypeManagedIdentity', 'IdentityTypeKey' LastModifiedByType IdentityType `json:"lastModifiedByType,omitempty"` // LastModifiedAt - The timestamp of resource last modification (UTC) LastModifiedAt *date.Time `json:"lastModifiedAt,omitempty"` @@ -11505,14 +11684,14 @@ type TrackedResource struct { Location *string `json:"location,omitempty"` // Tags - Resource tags. Tags map[string]*string `json:"tags"` - // SystemData - READ-ONLY - SystemData *SystemData `json:"systemData,omitempty"` // ID - READ-ONLY; Resource ID. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for TrackedResource. @@ -11570,13 +11749,13 @@ type URLPathMatchConditionParameters struct { type URLRedirectAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRedirectActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLSigning', 'NameOriginGroupOverride', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameBasicDeliveryRuleActionNameDeliveryRuleAction', 'NameBasicDeliveryRuleActionNameURLRedirect', 'NameBasicDeliveryRuleActionNameURLSigning', 'NameBasicDeliveryRuleActionNameOriginGroupOverride', 'NameBasicDeliveryRuleActionNameURLRewrite', 'NameBasicDeliveryRuleActionNameModifyRequestHeader', 'NameBasicDeliveryRuleActionNameModifyResponseHeader', 'NameBasicDeliveryRuleActionNameCacheExpiration', 'NameBasicDeliveryRuleActionNameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } // MarshalJSON is the custom marshaler for URLRedirectAction. func (ura URLRedirectAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRedirect + ura.Name = NameBasicDeliveryRuleActionNameURLRedirect objectMap := make(map[string]interface{}) if ura.Parameters != nil { objectMap["parameters"] = ura.Parameters @@ -11640,7 +11819,7 @@ func (ura URLRedirectAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleActio // URLRedirectActionParameters defines the parameters for the url redirect action. type URLRedirectActionParameters struct { OdataType *string `json:"@odata.type,omitempty"` - // RedirectType - The redirect type the rule will use when redirecting traffic. Possible values include: 'Moved', 'Found', 'TemporaryRedirect', 'PermanentRedirect' + // RedirectType - The redirect type the rule will use when redirecting traffic. Possible values include: 'RedirectTypeMoved', 'RedirectTypeFound', 'RedirectTypeTemporaryRedirect', 'RedirectTypePermanentRedirect' RedirectType RedirectType `json:"redirectType,omitempty"` // DestinationProtocol - Protocol to use for the redirect. The default value is MatchRequest. Possible values include: 'DestinationProtocolMatchRequest', 'DestinationProtocolHTTP', 'DestinationProtocolHTTPS' DestinationProtocol DestinationProtocol `json:"destinationProtocol,omitempty"` @@ -11658,13 +11837,13 @@ type URLRedirectActionParameters struct { type URLRewriteAction struct { // Parameters - Defines the parameters for the action. Parameters *URLRewriteActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLSigning', 'NameOriginGroupOverride', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameBasicDeliveryRuleActionNameDeliveryRuleAction', 'NameBasicDeliveryRuleActionNameURLRedirect', 'NameBasicDeliveryRuleActionNameURLSigning', 'NameBasicDeliveryRuleActionNameOriginGroupOverride', 'NameBasicDeliveryRuleActionNameURLRewrite', 'NameBasicDeliveryRuleActionNameModifyRequestHeader', 'NameBasicDeliveryRuleActionNameModifyResponseHeader', 'NameBasicDeliveryRuleActionNameCacheExpiration', 'NameBasicDeliveryRuleActionNameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } // MarshalJSON is the custom marshaler for URLRewriteAction. func (ura URLRewriteAction) MarshalJSON() ([]byte, error) { - ura.Name = NameURLRewrite + ura.Name = NameBasicDeliveryRuleActionNameURLRewrite objectMap := make(map[string]interface{}) if ura.Parameters != nil { objectMap["parameters"] = ura.Parameters @@ -11740,13 +11919,13 @@ type URLRewriteActionParameters struct { type URLSigningAction struct { // Parameters - Defines the parameters for the action. Parameters *URLSigningActionParameters `json:"parameters,omitempty"` - // Name - Possible values include: 'NameDeliveryRuleAction', 'NameURLRedirect', 'NameURLSigning', 'NameOriginGroupOverride', 'NameURLRewrite', 'NameModifyRequestHeader', 'NameModifyResponseHeader', 'NameCacheExpiration', 'NameCacheKeyQueryString' + // Name - Possible values include: 'NameBasicDeliveryRuleActionNameDeliveryRuleAction', 'NameBasicDeliveryRuleActionNameURLRedirect', 'NameBasicDeliveryRuleActionNameURLSigning', 'NameBasicDeliveryRuleActionNameOriginGroupOverride', 'NameBasicDeliveryRuleActionNameURLRewrite', 'NameBasicDeliveryRuleActionNameModifyRequestHeader', 'NameBasicDeliveryRuleActionNameModifyResponseHeader', 'NameBasicDeliveryRuleActionNameCacheExpiration', 'NameBasicDeliveryRuleActionNameCacheKeyQueryString' Name NameBasicDeliveryRuleAction `json:"name,omitempty"` } // MarshalJSON is the custom marshaler for URLSigningAction. func (usa URLSigningAction) MarshalJSON() ([]byte, error) { - usa.Name = NameURLSigning + usa.Name = NameBasicDeliveryRuleActionNameURLSigning objectMap := make(map[string]interface{}) if usa.Parameters != nil { objectMap["parameters"] = usa.Parameters @@ -11810,7 +11989,7 @@ func (usa URLSigningAction) AsBasicDeliveryRuleAction() (BasicDeliveryRuleAction // URLSigningActionParameters defines the parameters for the Url Signing action. type URLSigningActionParameters struct { OdataType *string `json:"@odata.type,omitempty"` - // Algorithm - Algorithm to use for URL signing. Possible values include: 'SHA256' + // Algorithm - Algorithm to use for URL signing. Possible values include: 'AlgorithmSHA256' Algorithm Algorithm `json:"algorithm,omitempty"` // ParameterNameOverride - Defines which query string parameters in the url to be considered for expires, key id etc. ParameterNameOverride *[]URLSigningParamIdentifier `json:"parameterNameOverride,omitempty"` @@ -11832,13 +12011,13 @@ type URLSigningKeyParameters struct { SecretSource *ResourceReference `json:"secretSource,omitempty"` // SecretVersion - Version of the secret to be used SecretVersion *string `json:"secretVersion,omitempty"` - // Type - Possible values include: 'TypeSecretParameters', 'TypeURLSigningKey', 'TypeManagedCertificate', 'TypeCustomerCertificate' + // Type - Possible values include: 'TypeBasicSecretParametersTypeSecretParameters', 'TypeBasicSecretParametersTypeURLSigningKey', 'TypeBasicSecretParametersTypeManagedCertificate', 'TypeBasicSecretParametersTypeCustomerCertificate' Type TypeBasicSecretParameters `json:"type,omitempty"` } // MarshalJSON is the custom marshaler for URLSigningKeyParameters. func (uskp URLSigningKeyParameters) MarshalJSON() ([]byte, error) { - uskp.Type = TypeURLSigningKey + uskp.Type = TypeBasicSecretParametersTypeURLSigningKey objectMap := make(map[string]interface{}) if uskp.KeyID != nil { objectMap["keyId"] = uskp.KeyID @@ -11882,7 +12061,7 @@ func (uskp URLSigningKeyParameters) AsBasicSecretParameters() (BasicSecretParame // URLSigningParamIdentifier defines how to identify a parameter for a specific purpose e.g. expires type URLSigningParamIdentifier struct { - // ParamIndicator - Indicates the purpose of the parameter. Possible values include: 'Expires', 'KeyID', 'Signature' + // ParamIndicator - Indicates the purpose of the parameter. Possible values include: 'ParamIndicatorExpires', 'ParamIndicatorKeyID', 'ParamIndicatorSignature' ParamIndicator ParamIndicator `json:"paramIndicator,omitempty"` // ParamName - Parameter name ParamName *string `json:"paramName,omitempty"` @@ -12092,7 +12271,7 @@ func NewUsagesListResultPage(cur UsagesListResult, getNextPage func(context.Cont type UserManagedHTTPSParameters struct { // CertificateSourceParameters - Defines the certificate source parameters using user's keyvault certificate for enabling SSL. CertificateSourceParameters *KeyVaultCertificateSourceParameters `json:"certificateSourceParameters,omitempty"` - // ProtocolType - Defines the TLS extension protocol that is used for secure delivery. Possible values include: 'ServerNameIndication', 'IPBased' + // ProtocolType - Defines the TLS extension protocol that is used for secure delivery. Possible values include: 'ProtocolTypeServerNameIndication', 'ProtocolTypeIPBased' ProtocolType ProtocolType `json:"protocolType,omitempty"` // MinimumTLSVersion - TLS protocol version that will be used for Https. Possible values include: 'MinimumTLSVersionNone', 'MinimumTLSVersionTLS10', 'MinimumTLSVersionTLS12' MinimumTLSVersion MinimumTLSVersion `json:"minimumTlsVersion,omitempty"` @@ -12196,7 +12375,7 @@ type ValidateSecretInput struct { // ValidateSecretOutput output of the validated secret. type ValidateSecretOutput struct { autorest.Response `json:"-"` - // Status - The validation status. Possible values include: 'Valid', 'Invalid', 'AccessDenied', 'CertificateExpired' + // Status - The validation status. Possible values include: 'StatusValid', 'StatusInvalid', 'StatusAccessDenied', 'StatusCertificateExpired' Status Status `json:"status,omitempty"` // Message - Detailed error message Message *string `json:"message,omitempty"` @@ -12281,14 +12460,14 @@ type WebApplicationFirewallPolicy struct { Location *string `json:"location,omitempty"` // Tags - Resource tags. Tags map[string]*string `json:"tags"` - // SystemData - READ-ONLY - SystemData *SystemData `json:"systemData,omitempty"` // ID - READ-ONLY; Resource ID. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Resource name. Name *string `json:"name,omitempty"` // Type - READ-ONLY; Resource type. Type *string `json:"type,omitempty"` + // SystemData - READ-ONLY + SystemData *SystemData `json:"systemData,omitempty"` } // MarshalJSON is the custom marshaler for WebApplicationFirewallPolicy. @@ -12366,15 +12545,6 @@ func (wafp *WebApplicationFirewallPolicy) UnmarshalJSON(body []byte) error { } wafp.Tags = tags } - case "systemData": - if v != nil { - var systemData SystemData - err = json.Unmarshal(*v, &systemData) - if err != nil { - return err - } - wafp.SystemData = &systemData - } case "id": if v != nil { var ID string @@ -12402,6 +12572,15 @@ func (wafp *WebApplicationFirewallPolicy) UnmarshalJSON(body []byte) error { } wafp.Type = &typeVar } + case "systemData": + if v != nil { + var systemData SystemData + err = json.Unmarshal(*v, &systemData) + if err != nil { + return err + } + wafp.SystemData = &systemData + } } } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/rulesets.go b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/rulesets.go index 241bd3da6d37..0d0909147f56 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/rulesets.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2020-09-01/cdn/rulesets.go @@ -36,8 +36,7 @@ func NewRuleSetsClientWithBaseURI(baseURI string, subscriptionID string) RuleSet // resourceGroupName - name of the Resource group within the Azure subscription. // profileName - name of the CDN profile which is unique within the resource group. // ruleSetName - name of the rule set under the profile which is unique globally -// ruleSet - ruleSet properties -func (client RuleSetsClient) Create(ctx context.Context, resourceGroupName string, profileName string, ruleSetName string, ruleSet RuleSet) (result RuleSetsCreateFuture, err error) { +func (client RuleSetsClient) Create(ctx context.Context, resourceGroupName string, profileName string, ruleSetName string) (result RuleSetsCreateFuture, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/RuleSetsClient.Create") defer func() { @@ -56,7 +55,7 @@ func (client RuleSetsClient) Create(ctx context.Context, resourceGroupName strin return result, validation.NewError("cdn.RuleSetsClient", "Create", err.Error()) } - req, err := client.CreatePreparer(ctx, resourceGroupName, profileName, ruleSetName, ruleSet) + req, err := client.CreatePreparer(ctx, resourceGroupName, profileName, ruleSetName) if err != nil { err = autorest.NewErrorWithError(err, "cdn.RuleSetsClient", "Create", nil, "Failure preparing request") return @@ -72,7 +71,7 @@ func (client RuleSetsClient) Create(ctx context.Context, resourceGroupName strin } // CreatePreparer prepares the Create request. -func (client RuleSetsClient) CreatePreparer(ctx context.Context, resourceGroupName string, profileName string, ruleSetName string, ruleSet RuleSet) (*http.Request, error) { +func (client RuleSetsClient) CreatePreparer(ctx context.Context, resourceGroupName string, profileName string, ruleSetName string) (*http.Request, error) { pathParameters := map[string]interface{}{ "profileName": autorest.Encode("path", profileName), "resourceGroupName": autorest.Encode("path", resourceGroupName), @@ -86,11 +85,9 @@ func (client RuleSetsClient) CreatePreparer(ctx context.Context, resourceGroupNa } preparer := autorest.CreatePreparer( - autorest.AsContentType("application/json; charset=utf-8"), autorest.AsPut(), autorest.WithBaseURL(client.BaseURI), autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/ruleSets/{ruleSetName}", pathParameters), - autorest.WithJSON(ruleSet), autorest.WithQueryParameters(queryParameters)) return preparer.Prepare((&http.Request{}).WithContext(ctx)) } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/CHANGELOG.md b/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/CHANGELOG.md index 52911e4cc5e4..97dacea793ea 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/CHANGELOG.md +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/CHANGELOG.md @@ -1,2 +1,192 @@ # Change History +## Breaking Changes + +### Removed Constants + +1. AgreementType.AS2 +1. AgreementType.Edifact +1. AgreementType.NotSpecified +1. AgreementType.X12 +1. AzureAsyncOperationState.Canceled +1. AzureAsyncOperationState.Failed +1. AzureAsyncOperationState.Pending +1. AzureAsyncOperationState.Succeeded +1. DayOfWeek.Friday +1. DayOfWeek.Monday +1. DayOfWeek.Saturday +1. DayOfWeek.Sunday +1. DayOfWeek.Thursday +1. DayOfWeek.Tuesday +1. DayOfWeek.Wednesday +1. EventLevel.Critical +1. EventLevel.Error +1. EventLevel.Informational +1. EventLevel.LogAlways +1. EventLevel.Verbose +1. EventLevel.Warning +1. IntegrationServiceEnvironmentSkuScaleType.Automatic +1. IntegrationServiceEnvironmentSkuScaleType.Manual +1. IntegrationServiceEnvironmentSkuScaleType.None +1. OpenAuthenticationProviderType.AAD +1. SwaggerSchemaType.Array +1. SwaggerSchemaType.Boolean +1. SwaggerSchemaType.File +1. SwaggerSchemaType.Integer +1. SwaggerSchemaType.Null +1. SwaggerSchemaType.Number +1. SwaggerSchemaType.Object +1. SwaggerSchemaType.String + +### Removed Funcs + +1. *ManagedAPIListResultIterator.Next() error +1. *ManagedAPIListResultIterator.NextWithContext(context.Context) error +1. *ManagedAPIListResultPage.Next() error +1. *ManagedAPIListResultPage.NextWithContext(context.Context) error +1. ManagedAPIListResult.IsEmpty() bool +1. ManagedAPIListResultIterator.NotDone() bool +1. ManagedAPIListResultIterator.Response() ManagedAPIListResult +1. ManagedAPIListResultIterator.Value() ManagedAPI +1. ManagedAPIListResultPage.NotDone() bool +1. ManagedAPIListResultPage.Response() ManagedAPIListResult +1. ManagedAPIListResultPage.Values() []ManagedAPI +1. NewManagedAPIListResultIterator(ManagedAPIListResultPage) ManagedAPIListResultIterator +1. NewManagedAPIListResultPage(ManagedAPIListResult, func(context.Context, ManagedAPIListResult) (ManagedAPIListResult, error)) ManagedAPIListResultPage +1. OpenAuthenticationAccessPolicy.MarshalJSON() ([]byte, error) + +### Struct Changes + +#### Removed Structs + +1. ManagedAPIListResultIterator +1. ManagedAPIListResultPage + +#### Removed Struct Fields + +1. ManagedAPI.autorest.Response +1. ManagedAPIListResult.autorest.Response + +### Signature Changes + +#### Funcs + +1. IntegrationServiceEnvironmentManagedApisClient.Get + - Returns + - From: ManagedAPI, error + - To: IntegrationServiceEnvironmentManagedAPI, error +1. IntegrationServiceEnvironmentManagedApisClient.GetResponder + - Returns + - From: ManagedAPI, error + - To: IntegrationServiceEnvironmentManagedAPI, error +1. IntegrationServiceEnvironmentManagedApisClient.List + - Returns + - From: ManagedAPIListResultPage, error + - To: IntegrationServiceEnvironmentManagedAPIListResultPage, error +1. IntegrationServiceEnvironmentManagedApisClient.ListComplete + - Returns + - From: ManagedAPIListResultIterator, error + - To: IntegrationServiceEnvironmentManagedAPIListResultIterator, error +1. IntegrationServiceEnvironmentManagedApisClient.ListResponder + - Returns + - From: ManagedAPIListResult, error + - To: IntegrationServiceEnvironmentManagedAPIListResult, error +1. IntegrationServiceEnvironmentManagedApisClient.Put + - Params + - From: context.Context, string, string, string + - To: context.Context, string, string, string, IntegrationServiceEnvironmentManagedAPI +1. IntegrationServiceEnvironmentManagedApisClient.PutPreparer + - Params + - From: context.Context, string, string, string + - To: context.Context, string, string, string, IntegrationServiceEnvironmentManagedAPI +1. IntegrationServiceEnvironmentManagedApisClient.PutResponder + - Returns + - From: ManagedAPI, error + - To: IntegrationServiceEnvironmentManagedAPI, error + +#### Struct Fields + +1. IntegrationAccountProperties.IntegrationServiceEnvironment changed type from *IntegrationServiceEnvironment to *ResourceReference +1. IntegrationServiceEnvironmentManagedApisPutFuture.Result changed type from func(IntegrationServiceEnvironmentManagedApisClient) (ManagedAPI, error) to func(IntegrationServiceEnvironmentManagedApisClient) (IntegrationServiceEnvironmentManagedAPI, error) + +## Additive Changes + +### New Constants + +1. AgreementType.AgreementTypeAS2 +1. AgreementType.AgreementTypeEdifact +1. AgreementType.AgreementTypeNotSpecified +1. AgreementType.AgreementTypeX12 +1. AzureAsyncOperationState.AzureAsyncOperationStateCanceled +1. AzureAsyncOperationState.AzureAsyncOperationStateFailed +1. AzureAsyncOperationState.AzureAsyncOperationStatePending +1. AzureAsyncOperationState.AzureAsyncOperationStateSucceeded +1. DayOfWeek.DayOfWeekFriday +1. DayOfWeek.DayOfWeekMonday +1. DayOfWeek.DayOfWeekSaturday +1. DayOfWeek.DayOfWeekSunday +1. DayOfWeek.DayOfWeekThursday +1. DayOfWeek.DayOfWeekTuesday +1. DayOfWeek.DayOfWeekWednesday +1. EventLevel.EventLevelCritical +1. EventLevel.EventLevelError +1. EventLevel.EventLevelInformational +1. EventLevel.EventLevelLogAlways +1. EventLevel.EventLevelVerbose +1. EventLevel.EventLevelWarning +1. IntegrationServiceEnvironmentSkuScaleType.IntegrationServiceEnvironmentSkuScaleTypeAutomatic +1. IntegrationServiceEnvironmentSkuScaleType.IntegrationServiceEnvironmentSkuScaleTypeManual +1. IntegrationServiceEnvironmentSkuScaleType.IntegrationServiceEnvironmentSkuScaleTypeNone +1. ManagedServiceIdentityType.ManagedServiceIdentityTypeNone +1. ManagedServiceIdentityType.ManagedServiceIdentityTypeSystemAssigned +1. ManagedServiceIdentityType.ManagedServiceIdentityTypeUserAssigned +1. OpenAuthenticationProviderType.OpenAuthenticationProviderTypeAAD +1. SwaggerSchemaType.SwaggerSchemaTypeArray +1. SwaggerSchemaType.SwaggerSchemaTypeBoolean +1. SwaggerSchemaType.SwaggerSchemaTypeFile +1. SwaggerSchemaType.SwaggerSchemaTypeInteger +1. SwaggerSchemaType.SwaggerSchemaTypeNull +1. SwaggerSchemaType.SwaggerSchemaTypeNumber +1. SwaggerSchemaType.SwaggerSchemaTypeObject +1. SwaggerSchemaType.SwaggerSchemaTypeString + +### New Funcs + +1. *IntegrationServiceEnvironmentManagedAPI.UnmarshalJSON([]byte) error +1. *IntegrationServiceEnvironmentManagedAPIListResultIterator.Next() error +1. *IntegrationServiceEnvironmentManagedAPIListResultIterator.NextWithContext(context.Context) error +1. *IntegrationServiceEnvironmentManagedAPIListResultPage.Next() error +1. *IntegrationServiceEnvironmentManagedAPIListResultPage.NextWithContext(context.Context) error +1. ContentLink.MarshalJSON() ([]byte, error) +1. IntegrationServiceEnvironmentManagedAPI.MarshalJSON() ([]byte, error) +1. IntegrationServiceEnvironmentManagedAPIListResult.IsEmpty() bool +1. IntegrationServiceEnvironmentManagedAPIListResultIterator.NotDone() bool +1. IntegrationServiceEnvironmentManagedAPIListResultIterator.Response() IntegrationServiceEnvironmentManagedAPIListResult +1. IntegrationServiceEnvironmentManagedAPIListResultIterator.Value() IntegrationServiceEnvironmentManagedAPI +1. IntegrationServiceEnvironmentManagedAPIListResultPage.NotDone() bool +1. IntegrationServiceEnvironmentManagedAPIListResultPage.Response() IntegrationServiceEnvironmentManagedAPIListResult +1. IntegrationServiceEnvironmentManagedAPIListResultPage.Values() []IntegrationServiceEnvironmentManagedAPI +1. IntegrationServiceEnvironmentManagedAPIProperties.MarshalJSON() ([]byte, error) +1. ManagedServiceIdentity.MarshalJSON() ([]byte, error) +1. NewIntegrationServiceEnvironmentManagedAPIListResultIterator(IntegrationServiceEnvironmentManagedAPIListResultPage) IntegrationServiceEnvironmentManagedAPIListResultIterator +1. NewIntegrationServiceEnvironmentManagedAPIListResultPage(IntegrationServiceEnvironmentManagedAPIListResult, func(context.Context, IntegrationServiceEnvironmentManagedAPIListResult) (IntegrationServiceEnvironmentManagedAPIListResult, error)) IntegrationServiceEnvironmentManagedAPIListResultPage +1. PossibleManagedServiceIdentityTypeValues() []ManagedServiceIdentityType +1. UserAssignedIdentity.MarshalJSON() ([]byte, error) + +### Struct Changes + +#### New Structs + +1. IntegrationServiceEnvironmentManagedAPI +1. IntegrationServiceEnvironmentManagedAPIDeploymentParameters +1. IntegrationServiceEnvironmentManagedAPIListResult +1. IntegrationServiceEnvironmentManagedAPIListResultIterator +1. IntegrationServiceEnvironmentManagedAPIListResultPage +1. IntegrationServiceEnvironmentManagedAPIProperties +1. ManagedServiceIdentity +1. UserAssignedIdentity + +#### New Struct Fields + +1. IntegrationServiceEnvironment.Identity +1. Workflow.Identity diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/_meta.json b/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/_meta.json index 9fd0e44ea21c..33c36a852f36 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/_meta.json +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/_meta.json @@ -1,11 +1,11 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "2b56c8a3da0e04aea6f6d80a9ac04741d1ae5904", "readme": "/_/azure-rest-api-specs/specification/logic/resource-manager/readme.md", "tag": "package-2019-05", "use": "@microsoft.azure/autorest.go@2.1.187", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "autorest_command": "autorest --use=@microsoft.azure/autorest.go@2.1.187 --tag=package-2019-05 --go-sdk-folder=/_/azure-sdk-for-go --go --verbose --use-onever --version=V2 --go.license-header=MICROSOFT_MIT_NO_VERSION /_/azure-rest-api-specs/specification/logic/resource-manager/readme.md", + "autorest_command": "autorest --use=@microsoft.azure/autorest.go@2.1.187 --tag=package-2019-05 --go-sdk-folder=/_/azure-sdk-for-go --go --verbose --use-onever --version=V2 --go.license-header=MICROSOFT_MIT_NO_VERSION --enum-prefix /_/azure-rest-api-specs/specification/logic/resource-manager/readme.md", "additional_properties": { - "additional_options": "--go --verbose --use-onever --version=V2 --go.license-header=MICROSOFT_MIT_NO_VERSION" + "additional_options": "--go --verbose --use-onever --version=V2 --go.license-header=MICROSOFT_MIT_NO_VERSION --enum-prefix" } } \ No newline at end of file diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/enums.go b/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/enums.go index 8b46b881d97c..d1efb92391fc 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/enums.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/enums.go @@ -10,19 +10,19 @@ package logic type AgreementType string const ( - // AS2 ... - AS2 AgreementType = "AS2" - // Edifact ... - Edifact AgreementType = "Edifact" - // NotSpecified ... - NotSpecified AgreementType = "NotSpecified" - // X12 ... - X12 AgreementType = "X12" + // AgreementTypeAS2 ... + AgreementTypeAS2 AgreementType = "AS2" + // AgreementTypeEdifact ... + AgreementTypeEdifact AgreementType = "Edifact" + // AgreementTypeNotSpecified ... + AgreementTypeNotSpecified AgreementType = "NotSpecified" + // AgreementTypeX12 ... + AgreementTypeX12 AgreementType = "X12" ) // PossibleAgreementTypeValues returns an array of possible values for the AgreementType const type. func PossibleAgreementTypeValues() []AgreementType { - return []AgreementType{AS2, Edifact, NotSpecified, X12} + return []AgreementType{AgreementTypeAS2, AgreementTypeEdifact, AgreementTypeNotSpecified, AgreementTypeX12} } // APIDeploymentParameterVisibility enumerates the values for api deployment parameter visibility. @@ -82,44 +82,44 @@ func PossibleAPITypeValues() []APIType { type AzureAsyncOperationState string const ( - // Canceled ... - Canceled AzureAsyncOperationState = "Canceled" - // Failed ... - Failed AzureAsyncOperationState = "Failed" - // Pending ... - Pending AzureAsyncOperationState = "Pending" - // Succeeded ... - Succeeded AzureAsyncOperationState = "Succeeded" + // AzureAsyncOperationStateCanceled ... + AzureAsyncOperationStateCanceled AzureAsyncOperationState = "Canceled" + // AzureAsyncOperationStateFailed ... + AzureAsyncOperationStateFailed AzureAsyncOperationState = "Failed" + // AzureAsyncOperationStatePending ... + AzureAsyncOperationStatePending AzureAsyncOperationState = "Pending" + // AzureAsyncOperationStateSucceeded ... + AzureAsyncOperationStateSucceeded AzureAsyncOperationState = "Succeeded" ) // PossibleAzureAsyncOperationStateValues returns an array of possible values for the AzureAsyncOperationState const type. func PossibleAzureAsyncOperationStateValues() []AzureAsyncOperationState { - return []AzureAsyncOperationState{Canceled, Failed, Pending, Succeeded} + return []AzureAsyncOperationState{AzureAsyncOperationStateCanceled, AzureAsyncOperationStateFailed, AzureAsyncOperationStatePending, AzureAsyncOperationStateSucceeded} } // DayOfWeek enumerates the values for day of week. type DayOfWeek string const ( - // Friday ... - Friday DayOfWeek = "Friday" - // Monday ... - Monday DayOfWeek = "Monday" - // Saturday ... - Saturday DayOfWeek = "Saturday" - // Sunday ... - Sunday DayOfWeek = "Sunday" - // Thursday ... - Thursday DayOfWeek = "Thursday" - // Tuesday ... - Tuesday DayOfWeek = "Tuesday" - // Wednesday ... - Wednesday DayOfWeek = "Wednesday" + // DayOfWeekFriday ... + DayOfWeekFriday DayOfWeek = "Friday" + // DayOfWeekMonday ... + DayOfWeekMonday DayOfWeek = "Monday" + // DayOfWeekSaturday ... + DayOfWeekSaturday DayOfWeek = "Saturday" + // DayOfWeekSunday ... + DayOfWeekSunday DayOfWeek = "Sunday" + // DayOfWeekThursday ... + DayOfWeekThursday DayOfWeek = "Thursday" + // DayOfWeekTuesday ... + DayOfWeekTuesday DayOfWeek = "Tuesday" + // DayOfWeekWednesday ... + DayOfWeekWednesday DayOfWeek = "Wednesday" ) // PossibleDayOfWeekValues returns an array of possible values for the DayOfWeek const type. func PossibleDayOfWeekValues() []DayOfWeek { - return []DayOfWeek{Friday, Monday, Saturday, Sunday, Thursday, Tuesday, Wednesday} + return []DayOfWeek{DayOfWeekFriday, DayOfWeekMonday, DayOfWeekSaturday, DayOfWeekSunday, DayOfWeekThursday, DayOfWeekTuesday, DayOfWeekWednesday} } // DaysOfWeek enumerates the values for days of week. @@ -253,23 +253,23 @@ func PossibleErrorResponseCodeValues() []ErrorResponseCode { type EventLevel string const ( - // Critical ... - Critical EventLevel = "Critical" - // Error ... - Error EventLevel = "Error" - // Informational ... - Informational EventLevel = "Informational" - // LogAlways ... - LogAlways EventLevel = "LogAlways" - // Verbose ... - Verbose EventLevel = "Verbose" - // Warning ... - Warning EventLevel = "Warning" + // EventLevelCritical ... + EventLevelCritical EventLevel = "Critical" + // EventLevelError ... + EventLevelError EventLevel = "Error" + // EventLevelInformational ... + EventLevelInformational EventLevel = "Informational" + // EventLevelLogAlways ... + EventLevelLogAlways EventLevel = "LogAlways" + // EventLevelVerbose ... + EventLevelVerbose EventLevel = "Verbose" + // EventLevelWarning ... + EventLevelWarning EventLevel = "Warning" ) // PossibleEventLevelValues returns an array of possible values for the EventLevel const type. func PossibleEventLevelValues() []EventLevel { - return []EventLevel{Critical, Error, Informational, LogAlways, Verbose, Warning} + return []EventLevel{EventLevelCritical, EventLevelError, EventLevelInformational, EventLevelLogAlways, EventLevelVerbose, EventLevelWarning} } // HashingAlgorithm enumerates the values for hashing algorithm. @@ -432,17 +432,17 @@ func PossibleIntegrationServiceEnvironmentSkuNameValues() []IntegrationServiceEn type IntegrationServiceEnvironmentSkuScaleType string const ( - // Automatic ... - Automatic IntegrationServiceEnvironmentSkuScaleType = "Automatic" - // Manual ... - Manual IntegrationServiceEnvironmentSkuScaleType = "Manual" - // None ... - None IntegrationServiceEnvironmentSkuScaleType = "None" + // IntegrationServiceEnvironmentSkuScaleTypeAutomatic ... + IntegrationServiceEnvironmentSkuScaleTypeAutomatic IntegrationServiceEnvironmentSkuScaleType = "Automatic" + // IntegrationServiceEnvironmentSkuScaleTypeManual ... + IntegrationServiceEnvironmentSkuScaleTypeManual IntegrationServiceEnvironmentSkuScaleType = "Manual" + // IntegrationServiceEnvironmentSkuScaleTypeNone ... + IntegrationServiceEnvironmentSkuScaleTypeNone IntegrationServiceEnvironmentSkuScaleType = "None" ) // PossibleIntegrationServiceEnvironmentSkuScaleTypeValues returns an array of possible values for the IntegrationServiceEnvironmentSkuScaleType const type. func PossibleIntegrationServiceEnvironmentSkuScaleTypeValues() []IntegrationServiceEnvironmentSkuScaleType { - return []IntegrationServiceEnvironmentSkuScaleType{Automatic, Manual, None} + return []IntegrationServiceEnvironmentSkuScaleType{IntegrationServiceEnvironmentSkuScaleTypeAutomatic, IntegrationServiceEnvironmentSkuScaleTypeManual, IntegrationServiceEnvironmentSkuScaleTypeNone} } // KeyType enumerates the values for key type. @@ -462,6 +462,23 @@ func PossibleKeyTypeValues() []KeyType { return []KeyType{KeyTypeNotSpecified, KeyTypePrimary, KeyTypeSecondary} } +// ManagedServiceIdentityType enumerates the values for managed service identity type. +type ManagedServiceIdentityType string + +const ( + // ManagedServiceIdentityTypeNone ... + ManagedServiceIdentityTypeNone ManagedServiceIdentityType = "None" + // ManagedServiceIdentityTypeSystemAssigned ... + ManagedServiceIdentityTypeSystemAssigned ManagedServiceIdentityType = "SystemAssigned" + // ManagedServiceIdentityTypeUserAssigned ... + ManagedServiceIdentityTypeUserAssigned ManagedServiceIdentityType = "UserAssigned" +) + +// PossibleManagedServiceIdentityTypeValues returns an array of possible values for the ManagedServiceIdentityType const type. +func PossibleManagedServiceIdentityTypeValues() []ManagedServiceIdentityType { + return []ManagedServiceIdentityType{ManagedServiceIdentityTypeNone, ManagedServiceIdentityTypeSystemAssigned, ManagedServiceIdentityTypeUserAssigned} +} + // MapType enumerates the values for map type. type MapType string @@ -504,13 +521,13 @@ func PossibleMessageFilterTypeValues() []MessageFilterType { type OpenAuthenticationProviderType string const ( - // AAD ... - AAD OpenAuthenticationProviderType = "AAD" + // OpenAuthenticationProviderTypeAAD ... + OpenAuthenticationProviderTypeAAD OpenAuthenticationProviderType = "AAD" ) // PossibleOpenAuthenticationProviderTypeValues returns an array of possible values for the OpenAuthenticationProviderType const type. func PossibleOpenAuthenticationProviderTypeValues() []OpenAuthenticationProviderType { - return []OpenAuthenticationProviderType{AAD} + return []OpenAuthenticationProviderType{OpenAuthenticationProviderTypeAAD} } // ParameterType enumerates the values for parameter type. @@ -687,27 +704,27 @@ func PossibleStatusAnnotationValues() []StatusAnnotation { type SwaggerSchemaType string const ( - // Array ... - Array SwaggerSchemaType = "Array" - // Boolean ... - Boolean SwaggerSchemaType = "Boolean" - // File ... - File SwaggerSchemaType = "File" - // Integer ... - Integer SwaggerSchemaType = "Integer" - // Null ... - Null SwaggerSchemaType = "Null" - // Number ... - Number SwaggerSchemaType = "Number" - // Object ... - Object SwaggerSchemaType = "Object" - // String ... - String SwaggerSchemaType = "String" + // SwaggerSchemaTypeArray ... + SwaggerSchemaTypeArray SwaggerSchemaType = "Array" + // SwaggerSchemaTypeBoolean ... + SwaggerSchemaTypeBoolean SwaggerSchemaType = "Boolean" + // SwaggerSchemaTypeFile ... + SwaggerSchemaTypeFile SwaggerSchemaType = "File" + // SwaggerSchemaTypeInteger ... + SwaggerSchemaTypeInteger SwaggerSchemaType = "Integer" + // SwaggerSchemaTypeNull ... + SwaggerSchemaTypeNull SwaggerSchemaType = "Null" + // SwaggerSchemaTypeNumber ... + SwaggerSchemaTypeNumber SwaggerSchemaType = "Number" + // SwaggerSchemaTypeObject ... + SwaggerSchemaTypeObject SwaggerSchemaType = "Object" + // SwaggerSchemaTypeString ... + SwaggerSchemaTypeString SwaggerSchemaType = "String" ) // PossibleSwaggerSchemaTypeValues returns an array of possible values for the SwaggerSchemaType const type. func PossibleSwaggerSchemaTypeValues() []SwaggerSchemaType { - return []SwaggerSchemaType{Array, Boolean, File, Integer, Null, Number, Object, String} + return []SwaggerSchemaType{SwaggerSchemaTypeArray, SwaggerSchemaTypeBoolean, SwaggerSchemaTypeFile, SwaggerSchemaTypeInteger, SwaggerSchemaTypeNull, SwaggerSchemaTypeNumber, SwaggerSchemaTypeObject, SwaggerSchemaTypeString} } // TrackEventsOperationOptions enumerates the values for track events operation options. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/integrationserviceenvironmentmanagedapis.go b/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/integrationserviceenvironmentmanagedapis.go index 56b9526a5c09..c884341f5d8a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/integrationserviceenvironmentmanagedapis.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/integrationserviceenvironmentmanagedapis.go @@ -117,7 +117,7 @@ func (client IntegrationServiceEnvironmentManagedApisClient) DeleteResponder(res // resourceGroup - the resource group name. // integrationServiceEnvironmentName - the integration service environment name. // APIName - the api name. -func (client IntegrationServiceEnvironmentManagedApisClient) Get(ctx context.Context, resourceGroup string, integrationServiceEnvironmentName string, APIName string) (result ManagedAPI, err error) { +func (client IntegrationServiceEnvironmentManagedApisClient) Get(ctx context.Context, resourceGroup string, integrationServiceEnvironmentName string, APIName string) (result IntegrationServiceEnvironmentManagedAPI, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/IntegrationServiceEnvironmentManagedApisClient.Get") defer func() { @@ -180,7 +180,7 @@ func (client IntegrationServiceEnvironmentManagedApisClient) GetSender(req *http // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. -func (client IntegrationServiceEnvironmentManagedApisClient) GetResponder(resp *http.Response) (result ManagedAPI, err error) { +func (client IntegrationServiceEnvironmentManagedApisClient) GetResponder(resp *http.Response) (result IntegrationServiceEnvironmentManagedAPI, err error) { err = autorest.Respond( resp, azure.WithErrorUnlessStatusCode(http.StatusOK), @@ -194,13 +194,13 @@ func (client IntegrationServiceEnvironmentManagedApisClient) GetResponder(resp * // Parameters: // resourceGroup - the resource group. // integrationServiceEnvironmentName - the integration service environment name. -func (client IntegrationServiceEnvironmentManagedApisClient) List(ctx context.Context, resourceGroup string, integrationServiceEnvironmentName string) (result ManagedAPIListResultPage, err error) { +func (client IntegrationServiceEnvironmentManagedApisClient) List(ctx context.Context, resourceGroup string, integrationServiceEnvironmentName string) (result IntegrationServiceEnvironmentManagedAPIListResultPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/IntegrationServiceEnvironmentManagedApisClient.List") defer func() { sc := -1 - if result.malr.Response.Response != nil { - sc = result.malr.Response.Response.StatusCode + if result.isemalr.Response.Response != nil { + sc = result.isemalr.Response.Response.StatusCode } tracing.EndSpan(ctx, sc, err) }() @@ -214,17 +214,17 @@ func (client IntegrationServiceEnvironmentManagedApisClient) List(ctx context.Co resp, err := client.ListSender(req) if err != nil { - result.malr.Response = autorest.Response{Response: resp} + result.isemalr.Response = autorest.Response{Response: resp} err = autorest.NewErrorWithError(err, "logic.IntegrationServiceEnvironmentManagedApisClient", "List", resp, "Failure sending request") return } - result.malr, err = client.ListResponder(resp) + result.isemalr, err = client.ListResponder(resp) if err != nil { err = autorest.NewErrorWithError(err, "logic.IntegrationServiceEnvironmentManagedApisClient", "List", resp, "Failure responding to request") return } - if result.malr.hasNextLink() && result.malr.IsEmpty() { + if result.isemalr.hasNextLink() && result.isemalr.IsEmpty() { err = result.NextWithContext(ctx) return } @@ -261,7 +261,7 @@ func (client IntegrationServiceEnvironmentManagedApisClient) ListSender(req *htt // ListResponder handles the response to the List request. The method always // closes the http.Response Body. -func (client IntegrationServiceEnvironmentManagedApisClient) ListResponder(resp *http.Response) (result ManagedAPIListResult, err error) { +func (client IntegrationServiceEnvironmentManagedApisClient) ListResponder(resp *http.Response) (result IntegrationServiceEnvironmentManagedAPIListResult, err error) { err = autorest.Respond( resp, azure.WithErrorUnlessStatusCode(http.StatusOK), @@ -272,8 +272,8 @@ func (client IntegrationServiceEnvironmentManagedApisClient) ListResponder(resp } // listNextResults retrieves the next set of results, if any. -func (client IntegrationServiceEnvironmentManagedApisClient) listNextResults(ctx context.Context, lastResults ManagedAPIListResult) (result ManagedAPIListResult, err error) { - req, err := lastResults.managedAPIListResultPreparer(ctx) +func (client IntegrationServiceEnvironmentManagedApisClient) listNextResults(ctx context.Context, lastResults IntegrationServiceEnvironmentManagedAPIListResult) (result IntegrationServiceEnvironmentManagedAPIListResult, err error) { + req, err := lastResults.integrationServiceEnvironmentManagedAPIListResultPreparer(ctx) if err != nil { return result, autorest.NewErrorWithError(err, "logic.IntegrationServiceEnvironmentManagedApisClient", "listNextResults", nil, "Failure preparing next results request") } @@ -293,7 +293,7 @@ func (client IntegrationServiceEnvironmentManagedApisClient) listNextResults(ctx } // ListComplete enumerates all values, automatically crossing page boundaries as required. -func (client IntegrationServiceEnvironmentManagedApisClient) ListComplete(ctx context.Context, resourceGroup string, integrationServiceEnvironmentName string) (result ManagedAPIListResultIterator, err error) { +func (client IntegrationServiceEnvironmentManagedApisClient) ListComplete(ctx context.Context, resourceGroup string, integrationServiceEnvironmentName string) (result IntegrationServiceEnvironmentManagedAPIListResultIterator, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/IntegrationServiceEnvironmentManagedApisClient.List") defer func() { @@ -313,7 +313,8 @@ func (client IntegrationServiceEnvironmentManagedApisClient) ListComplete(ctx co // resourceGroup - the resource group name. // integrationServiceEnvironmentName - the integration service environment name. // APIName - the api name. -func (client IntegrationServiceEnvironmentManagedApisClient) Put(ctx context.Context, resourceGroup string, integrationServiceEnvironmentName string, APIName string) (result IntegrationServiceEnvironmentManagedApisPutFuture, err error) { +// integrationServiceEnvironmentManagedAPI - the integration service environment managed api. +func (client IntegrationServiceEnvironmentManagedApisClient) Put(ctx context.Context, resourceGroup string, integrationServiceEnvironmentName string, APIName string, integrationServiceEnvironmentManagedAPI IntegrationServiceEnvironmentManagedAPI) (result IntegrationServiceEnvironmentManagedApisPutFuture, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/IntegrationServiceEnvironmentManagedApisClient.Put") defer func() { @@ -324,7 +325,7 @@ func (client IntegrationServiceEnvironmentManagedApisClient) Put(ctx context.Con tracing.EndSpan(ctx, sc, err) }() } - req, err := client.PutPreparer(ctx, resourceGroup, integrationServiceEnvironmentName, APIName) + req, err := client.PutPreparer(ctx, resourceGroup, integrationServiceEnvironmentName, APIName, integrationServiceEnvironmentManagedAPI) if err != nil { err = autorest.NewErrorWithError(err, "logic.IntegrationServiceEnvironmentManagedApisClient", "Put", nil, "Failure preparing request") return @@ -340,7 +341,7 @@ func (client IntegrationServiceEnvironmentManagedApisClient) Put(ctx context.Con } // PutPreparer prepares the Put request. -func (client IntegrationServiceEnvironmentManagedApisClient) PutPreparer(ctx context.Context, resourceGroup string, integrationServiceEnvironmentName string, APIName string) (*http.Request, error) { +func (client IntegrationServiceEnvironmentManagedApisClient) PutPreparer(ctx context.Context, resourceGroup string, integrationServiceEnvironmentName string, APIName string, integrationServiceEnvironmentManagedAPI IntegrationServiceEnvironmentManagedAPI) (*http.Request, error) { pathParameters := map[string]interface{}{ "apiName": autorest.Encode("path", APIName), "integrationServiceEnvironmentName": autorest.Encode("path", integrationServiceEnvironmentName), @@ -354,9 +355,11 @@ func (client IntegrationServiceEnvironmentManagedApisClient) PutPreparer(ctx con } preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), autorest.AsPut(), autorest.WithBaseURL(client.BaseURI), autorest.WithPathParameters("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Logic/integrationServiceEnvironments/{integrationServiceEnvironmentName}/managedApis/{apiName}", pathParameters), + autorest.WithJSON(integrationServiceEnvironmentManagedAPI), autorest.WithQueryParameters(queryParameters)) return preparer.Prepare((&http.Request{}).WithContext(ctx)) } @@ -379,7 +382,7 @@ func (client IntegrationServiceEnvironmentManagedApisClient) PutSender(req *http // PutResponder handles the response to the Put request. The method always // closes the http.Response Body. -func (client IntegrationServiceEnvironmentManagedApisClient) PutResponder(resp *http.Response) (result ManagedAPI, err error) { +func (client IntegrationServiceEnvironmentManagedApisClient) PutResponder(resp *http.Response) (result IntegrationServiceEnvironmentManagedAPI, err error) { err = autorest.Respond( resp, azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/models.go index 9072bac346bc..63d8a1af4974 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic/models.go @@ -14,6 +14,7 @@ import ( "github.com/Azure/go-autorest/autorest/date" "github.com/Azure/go-autorest/autorest/to" "github.com/Azure/go-autorest/tracing" + "github.com/gofrs/uuid" "net/http" ) @@ -475,76 +476,40 @@ type APIResourcePolicies struct { // APIResourceProperties the API resource properties. type APIResourceProperties struct { - // Name - The name + // Name - READ-ONLY; The name Name *string `json:"name,omitempty"` - // ConnectionParameters - The connection parameters. + // ConnectionParameters - READ-ONLY; The connection parameters. ConnectionParameters map[string]interface{} `json:"connectionParameters"` - // Metadata - The metadata. + // Metadata - READ-ONLY; The metadata. Metadata *APIResourceMetadata `json:"metadata,omitempty"` - // RuntimeUrls - The runtime urls. + // RuntimeUrls - READ-ONLY; The runtime urls. RuntimeUrls *[]string `json:"runtimeUrls,omitempty"` - // GeneralInformation - The api general information. + // GeneralInformation - READ-ONLY; The api general information. GeneralInformation *APIResourceGeneralInformation `json:"generalInformation,omitempty"` - // Capabilities - The capabilities. + // Capabilities - READ-ONLY; The capabilities. Capabilities *[]string `json:"capabilities,omitempty"` - // BackendService - The backend service. + // BackendService - READ-ONLY; The backend service. BackendService *APIResourceBackendService `json:"backendService,omitempty"` - // Policies - The policies for the API. + // Policies - READ-ONLY; The policies for the API. Policies *APIResourcePolicies `json:"policies,omitempty"` - // APIDefinitionURL - The API definition. + // APIDefinitionURL - READ-ONLY; The API definition. APIDefinitionURL *string `json:"apiDefinitionUrl,omitempty"` - // APIDefinitions - The api definitions. + // APIDefinitions - READ-ONLY; The api definitions. APIDefinitions *APIResourceDefinitions `json:"apiDefinitions,omitempty"` // IntegrationServiceEnvironment - The integration service environment reference. IntegrationServiceEnvironment *ResourceReference `json:"integrationServiceEnvironment,omitempty"` - // ProvisioningState - The provisioning state. Possible values include: 'WorkflowProvisioningStateNotSpecified', 'WorkflowProvisioningStateAccepted', 'WorkflowProvisioningStateRunning', 'WorkflowProvisioningStateReady', 'WorkflowProvisioningStateCreating', 'WorkflowProvisioningStateCreated', 'WorkflowProvisioningStateDeleting', 'WorkflowProvisioningStateDeleted', 'WorkflowProvisioningStateCanceled', 'WorkflowProvisioningStateFailed', 'WorkflowProvisioningStateSucceeded', 'WorkflowProvisioningStateMoving', 'WorkflowProvisioningStateUpdating', 'WorkflowProvisioningStateRegistering', 'WorkflowProvisioningStateRegistered', 'WorkflowProvisioningStateUnregistering', 'WorkflowProvisioningStateUnregistered', 'WorkflowProvisioningStateCompleted', 'WorkflowProvisioningStateRenewing', 'WorkflowProvisioningStatePending', 'WorkflowProvisioningStateWaiting', 'WorkflowProvisioningStateInProgress' + // ProvisioningState - READ-ONLY; The provisioning state. Possible values include: 'WorkflowProvisioningStateNotSpecified', 'WorkflowProvisioningStateAccepted', 'WorkflowProvisioningStateRunning', 'WorkflowProvisioningStateReady', 'WorkflowProvisioningStateCreating', 'WorkflowProvisioningStateCreated', 'WorkflowProvisioningStateDeleting', 'WorkflowProvisioningStateDeleted', 'WorkflowProvisioningStateCanceled', 'WorkflowProvisioningStateFailed', 'WorkflowProvisioningStateSucceeded', 'WorkflowProvisioningStateMoving', 'WorkflowProvisioningStateUpdating', 'WorkflowProvisioningStateRegistering', 'WorkflowProvisioningStateRegistered', 'WorkflowProvisioningStateUnregistering', 'WorkflowProvisioningStateUnregistered', 'WorkflowProvisioningStateCompleted', 'WorkflowProvisioningStateRenewing', 'WorkflowProvisioningStatePending', 'WorkflowProvisioningStateWaiting', 'WorkflowProvisioningStateInProgress' ProvisioningState WorkflowProvisioningState `json:"provisioningState,omitempty"` - // Category - The category. Possible values include: 'APITierNotSpecified', 'APITierEnterprise', 'APITierStandard', 'APITierPremium' + // Category - READ-ONLY; The category. Possible values include: 'APITierNotSpecified', 'APITierEnterprise', 'APITierStandard', 'APITierPremium' Category APITier `json:"category,omitempty"` } // MarshalJSON is the custom marshaler for APIResourceProperties. func (arp APIResourceProperties) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) - if arp.Name != nil { - objectMap["name"] = arp.Name - } - if arp.ConnectionParameters != nil { - objectMap["connectionParameters"] = arp.ConnectionParameters - } - if arp.Metadata != nil { - objectMap["metadata"] = arp.Metadata - } - if arp.RuntimeUrls != nil { - objectMap["runtimeUrls"] = arp.RuntimeUrls - } - if arp.GeneralInformation != nil { - objectMap["generalInformation"] = arp.GeneralInformation - } - if arp.Capabilities != nil { - objectMap["capabilities"] = arp.Capabilities - } - if arp.BackendService != nil { - objectMap["backendService"] = arp.BackendService - } - if arp.Policies != nil { - objectMap["policies"] = arp.Policies - } - if arp.APIDefinitionURL != nil { - objectMap["apiDefinitionUrl"] = arp.APIDefinitionURL - } - if arp.APIDefinitions != nil { - objectMap["apiDefinitions"] = arp.APIDefinitions - } if arp.IntegrationServiceEnvironment != nil { objectMap["integrationServiceEnvironment"] = arp.IntegrationServiceEnvironment } - if arp.ProvisioningState != "" { - objectMap["provisioningState"] = arp.ProvisioningState - } - if arp.Category != "" { - objectMap["category"] = arp.Category - } return json.Marshal(objectMap) } @@ -887,16 +852,25 @@ type ContentHash struct { type ContentLink struct { // URI - The content link URI. URI *string `json:"uri,omitempty"` - // ContentVersion - The content version. + // ContentVersion - READ-ONLY; The content version. ContentVersion *string `json:"contentVersion,omitempty"` - // ContentSize - The content size. + // ContentSize - READ-ONLY; The content size. ContentSize *int64 `json:"contentSize,omitempty"` - // ContentHash - The content hash. + // ContentHash - READ-ONLY; The content hash. ContentHash *ContentHash `json:"contentHash,omitempty"` - // Metadata - The metadata. + // Metadata - READ-ONLY; The metadata. Metadata interface{} `json:"metadata,omitempty"` } +// MarshalJSON is the custom marshaler for ContentLink. +func (cl ContentLink) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if cl.URI != nil { + objectMap["uri"] = cl.URI + } + return json.Marshal(objectMap) +} + // Correlation the correlation property. type Correlation struct { // ClientTrackingID - The client tracking id. @@ -1563,7 +1537,7 @@ func (iaa *IntegrationAccountAgreement) UnmarshalJSON(body []byte) error { // IntegrationAccountAgreementFilter the integration account agreement filter for odata query. type IntegrationAccountAgreementFilter struct { - // AgreementType - The agreement type of integration account agreement. Possible values include: 'NotSpecified', 'AS2', 'X12', 'Edifact' + // AgreementType - The agreement type of integration account agreement. Possible values include: 'AgreementTypeNotSpecified', 'AgreementTypeAS2', 'AgreementTypeX12', 'AgreementTypeEdifact' AgreementType AgreementType `json:"agreementType,omitempty"` } @@ -1735,7 +1709,7 @@ type IntegrationAccountAgreementProperties struct { ChangedTime *date.Time `json:"changedTime,omitempty"` // Metadata - The metadata. Metadata interface{} `json:"metadata,omitempty"` - // AgreementType - The agreement type. Possible values include: 'NotSpecified', 'AS2', 'X12', 'Edifact' + // AgreementType - The agreement type. Possible values include: 'AgreementTypeNotSpecified', 'AgreementTypeAS2', 'AgreementTypeX12', 'AgreementTypeEdifact' AgreementType AgreementType `json:"agreementType,omitempty"` // HostPartner - The integration account partner that is set as host partner for this agreement. HostPartner *string `json:"hostPartner,omitempty"` @@ -2838,7 +2812,7 @@ func (iapp IntegrationAccountPartnerProperties) MarshalJSON() ([]byte, error) { // IntegrationAccountProperties the integration account properties. type IntegrationAccountProperties struct { // IntegrationServiceEnvironment - The integration service environment. - IntegrationServiceEnvironment *IntegrationServiceEnvironment `json:"integrationServiceEnvironment,omitempty"` + IntegrationServiceEnvironment *ResourceReference `json:"integrationServiceEnvironment,omitempty"` // State - The workflow state. Possible values include: 'WorkflowStateNotSpecified', 'WorkflowStateCompleted', 'WorkflowStateEnabled', 'WorkflowStateDisabled', 'WorkflowStateDeleted', 'WorkflowStateSuspended' State WorkflowState `json:"state,omitempty"` } @@ -3477,7 +3451,8 @@ type IntegrationServiceEnvironment struct { // Properties - The integration service environment properties. Properties *IntegrationServiceEnvironmentProperties `json:"properties,omitempty"` // Sku - The sku. - Sku *IntegrationServiceEnvironmentSku `json:"sku,omitempty"` + Sku *IntegrationServiceEnvironmentSku `json:"sku,omitempty"` + Identity *ManagedServiceIdentity `json:"identity,omitempty"` // ID - READ-ONLY; The resource id. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Gets the resource name. @@ -3499,6 +3474,9 @@ func (ise IntegrationServiceEnvironment) MarshalJSON() ([]byte, error) { if ise.Sku != nil { objectMap["sku"] = ise.Sku } + if ise.Identity != nil { + objectMap["identity"] = ise.Identity + } if ise.Location != nil { objectMap["location"] = ise.Location } @@ -3673,6 +3651,321 @@ func NewIntegrationServiceEnvironmentListResultPage(cur IntegrationServiceEnviro } } +// IntegrationServiceEnvironmentManagedAPI the integration service environment managed api. +type IntegrationServiceEnvironmentManagedAPI struct { + autorest.Response `json:"-"` + // IntegrationServiceEnvironmentManagedAPIProperties - The integration service environment managed api properties. + *IntegrationServiceEnvironmentManagedAPIProperties `json:"properties,omitempty"` + // ID - READ-ONLY; The resource id. + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; Gets the resource name. + Name *string `json:"name,omitempty"` + // Type - READ-ONLY; Gets the resource type. + Type *string `json:"type,omitempty"` + // Location - The resource location. + Location *string `json:"location,omitempty"` + // Tags - The resource tags. + Tags map[string]*string `json:"tags"` +} + +// MarshalJSON is the custom marshaler for IntegrationServiceEnvironmentManagedAPI. +func (isema IntegrationServiceEnvironmentManagedAPI) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if isema.IntegrationServiceEnvironmentManagedAPIProperties != nil { + objectMap["properties"] = isema.IntegrationServiceEnvironmentManagedAPIProperties + } + if isema.Location != nil { + objectMap["location"] = isema.Location + } + if isema.Tags != nil { + objectMap["tags"] = isema.Tags + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for IntegrationServiceEnvironmentManagedAPI struct. +func (isema *IntegrationServiceEnvironmentManagedAPI) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var integrationServiceEnvironmentManagedAPIProperties IntegrationServiceEnvironmentManagedAPIProperties + err = json.Unmarshal(*v, &integrationServiceEnvironmentManagedAPIProperties) + if err != nil { + return err + } + isema.IntegrationServiceEnvironmentManagedAPIProperties = &integrationServiceEnvironmentManagedAPIProperties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + isema.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + isema.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + isema.Type = &typeVar + } + case "location": + if v != nil { + var location string + err = json.Unmarshal(*v, &location) + if err != nil { + return err + } + isema.Location = &location + } + case "tags": + if v != nil { + var tags map[string]*string + err = json.Unmarshal(*v, &tags) + if err != nil { + return err + } + isema.Tags = tags + } + } + } + + return nil +} + +// IntegrationServiceEnvironmentManagedAPIDeploymentParameters the integration service environment managed +// api deployment parameters. +type IntegrationServiceEnvironmentManagedAPIDeploymentParameters struct { + // ContentLinkDefinition - The integration service environment managed api content link for deployment. + ContentLinkDefinition *ContentLink `json:"contentLinkDefinition,omitempty"` +} + +// IntegrationServiceEnvironmentManagedAPIListResult the list of integration service environment managed +// APIs. +type IntegrationServiceEnvironmentManagedAPIListResult struct { + autorest.Response `json:"-"` + // Value - The integration service environment managed APIs. + Value *[]IntegrationServiceEnvironmentManagedAPI `json:"value,omitempty"` + // NextLink - The URL to get the next set of results. + NextLink *string `json:"nextLink,omitempty"` +} + +// IntegrationServiceEnvironmentManagedAPIListResultIterator provides access to a complete listing of +// IntegrationServiceEnvironmentManagedAPI values. +type IntegrationServiceEnvironmentManagedAPIListResultIterator struct { + i int + page IntegrationServiceEnvironmentManagedAPIListResultPage +} + +// NextWithContext advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +func (iter *IntegrationServiceEnvironmentManagedAPIListResultIterator) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/IntegrationServiceEnvironmentManagedAPIListResultIterator.NextWithContext") + defer func() { + sc := -1 + if iter.Response().Response.Response != nil { + sc = iter.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + iter.i++ + if iter.i < len(iter.page.Values()) { + return nil + } + err = iter.page.NextWithContext(ctx) + if err != nil { + iter.i-- + return err + } + iter.i = 0 + return nil +} + +// Next advances to the next value. If there was an error making +// the request the iterator does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (iter *IntegrationServiceEnvironmentManagedAPIListResultIterator) Next() error { + return iter.NextWithContext(context.Background()) +} + +// NotDone returns true if the enumeration should be started or is not yet complete. +func (iter IntegrationServiceEnvironmentManagedAPIListResultIterator) NotDone() bool { + return iter.page.NotDone() && iter.i < len(iter.page.Values()) +} + +// Response returns the raw server response from the last page request. +func (iter IntegrationServiceEnvironmentManagedAPIListResultIterator) Response() IntegrationServiceEnvironmentManagedAPIListResult { + return iter.page.Response() +} + +// Value returns the current value or a zero-initialized value if the +// iterator has advanced beyond the end of the collection. +func (iter IntegrationServiceEnvironmentManagedAPIListResultIterator) Value() IntegrationServiceEnvironmentManagedAPI { + if !iter.page.NotDone() { + return IntegrationServiceEnvironmentManagedAPI{} + } + return iter.page.Values()[iter.i] +} + +// Creates a new instance of the IntegrationServiceEnvironmentManagedAPIListResultIterator type. +func NewIntegrationServiceEnvironmentManagedAPIListResultIterator(page IntegrationServiceEnvironmentManagedAPIListResultPage) IntegrationServiceEnvironmentManagedAPIListResultIterator { + return IntegrationServiceEnvironmentManagedAPIListResultIterator{page: page} +} + +// IsEmpty returns true if the ListResult contains no values. +func (isemalr IntegrationServiceEnvironmentManagedAPIListResult) IsEmpty() bool { + return isemalr.Value == nil || len(*isemalr.Value) == 0 +} + +// hasNextLink returns true if the NextLink is not empty. +func (isemalr IntegrationServiceEnvironmentManagedAPIListResult) hasNextLink() bool { + return isemalr.NextLink != nil && len(*isemalr.NextLink) != 0 +} + +// integrationServiceEnvironmentManagedAPIListResultPreparer prepares a request to retrieve the next set of results. +// It returns nil if no more results exist. +func (isemalr IntegrationServiceEnvironmentManagedAPIListResult) integrationServiceEnvironmentManagedAPIListResultPreparer(ctx context.Context) (*http.Request, error) { + if !isemalr.hasNextLink() { + return nil, nil + } + return autorest.Prepare((&http.Request{}).WithContext(ctx), + autorest.AsJSON(), + autorest.AsGet(), + autorest.WithBaseURL(to.String(isemalr.NextLink))) +} + +// IntegrationServiceEnvironmentManagedAPIListResultPage contains a page of +// IntegrationServiceEnvironmentManagedAPI values. +type IntegrationServiceEnvironmentManagedAPIListResultPage struct { + fn func(context.Context, IntegrationServiceEnvironmentManagedAPIListResult) (IntegrationServiceEnvironmentManagedAPIListResult, error) + isemalr IntegrationServiceEnvironmentManagedAPIListResult +} + +// NextWithContext advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +func (page *IntegrationServiceEnvironmentManagedAPIListResultPage) NextWithContext(ctx context.Context) (err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/IntegrationServiceEnvironmentManagedAPIListResultPage.NextWithContext") + defer func() { + sc := -1 + if page.Response().Response.Response != nil { + sc = page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + for { + next, err := page.fn(ctx, page.isemalr) + if err != nil { + return err + } + page.isemalr = next + if !next.hasNextLink() || !next.IsEmpty() { + break + } + } + return nil +} + +// Next advances to the next page of values. If there was an error making +// the request the page does not advance and the error is returned. +// Deprecated: Use NextWithContext() instead. +func (page *IntegrationServiceEnvironmentManagedAPIListResultPage) Next() error { + return page.NextWithContext(context.Background()) +} + +// NotDone returns true if the page enumeration should be started or is not yet complete. +func (page IntegrationServiceEnvironmentManagedAPIListResultPage) NotDone() bool { + return !page.isemalr.IsEmpty() +} + +// Response returns the raw server response from the last page request. +func (page IntegrationServiceEnvironmentManagedAPIListResultPage) Response() IntegrationServiceEnvironmentManagedAPIListResult { + return page.isemalr +} + +// Values returns the slice of values for the current page or nil if there are no values. +func (page IntegrationServiceEnvironmentManagedAPIListResultPage) Values() []IntegrationServiceEnvironmentManagedAPI { + if page.isemalr.IsEmpty() { + return nil + } + return *page.isemalr.Value +} + +// Creates a new instance of the IntegrationServiceEnvironmentManagedAPIListResultPage type. +func NewIntegrationServiceEnvironmentManagedAPIListResultPage(cur IntegrationServiceEnvironmentManagedAPIListResult, getNextPage func(context.Context, IntegrationServiceEnvironmentManagedAPIListResult) (IntegrationServiceEnvironmentManagedAPIListResult, error)) IntegrationServiceEnvironmentManagedAPIListResultPage { + return IntegrationServiceEnvironmentManagedAPIListResultPage{ + fn: getNextPage, + isemalr: cur, + } +} + +// IntegrationServiceEnvironmentManagedAPIProperties the integration service environment managed api +// properties. +type IntegrationServiceEnvironmentManagedAPIProperties struct { + // DeploymentParameters - The integration service environment managed api deployment parameters. + DeploymentParameters *IntegrationServiceEnvironmentManagedAPIDeploymentParameters `json:"deploymentParameters,omitempty"` + // Name - READ-ONLY; The name + Name *string `json:"name,omitempty"` + // ConnectionParameters - READ-ONLY; The connection parameters. + ConnectionParameters map[string]interface{} `json:"connectionParameters"` + // Metadata - READ-ONLY; The metadata. + Metadata *APIResourceMetadata `json:"metadata,omitempty"` + // RuntimeUrls - READ-ONLY; The runtime urls. + RuntimeUrls *[]string `json:"runtimeUrls,omitempty"` + // GeneralInformation - READ-ONLY; The api general information. + GeneralInformation *APIResourceGeneralInformation `json:"generalInformation,omitempty"` + // Capabilities - READ-ONLY; The capabilities. + Capabilities *[]string `json:"capabilities,omitempty"` + // BackendService - READ-ONLY; The backend service. + BackendService *APIResourceBackendService `json:"backendService,omitempty"` + // Policies - READ-ONLY; The policies for the API. + Policies *APIResourcePolicies `json:"policies,omitempty"` + // APIDefinitionURL - READ-ONLY; The API definition. + APIDefinitionURL *string `json:"apiDefinitionUrl,omitempty"` + // APIDefinitions - READ-ONLY; The api definitions. + APIDefinitions *APIResourceDefinitions `json:"apiDefinitions,omitempty"` + // IntegrationServiceEnvironment - The integration service environment reference. + IntegrationServiceEnvironment *ResourceReference `json:"integrationServiceEnvironment,omitempty"` + // ProvisioningState - READ-ONLY; The provisioning state. Possible values include: 'WorkflowProvisioningStateNotSpecified', 'WorkflowProvisioningStateAccepted', 'WorkflowProvisioningStateRunning', 'WorkflowProvisioningStateReady', 'WorkflowProvisioningStateCreating', 'WorkflowProvisioningStateCreated', 'WorkflowProvisioningStateDeleting', 'WorkflowProvisioningStateDeleted', 'WorkflowProvisioningStateCanceled', 'WorkflowProvisioningStateFailed', 'WorkflowProvisioningStateSucceeded', 'WorkflowProvisioningStateMoving', 'WorkflowProvisioningStateUpdating', 'WorkflowProvisioningStateRegistering', 'WorkflowProvisioningStateRegistered', 'WorkflowProvisioningStateUnregistering', 'WorkflowProvisioningStateUnregistered', 'WorkflowProvisioningStateCompleted', 'WorkflowProvisioningStateRenewing', 'WorkflowProvisioningStatePending', 'WorkflowProvisioningStateWaiting', 'WorkflowProvisioningStateInProgress' + ProvisioningState WorkflowProvisioningState `json:"provisioningState,omitempty"` + // Category - READ-ONLY; The category. Possible values include: 'APITierNotSpecified', 'APITierEnterprise', 'APITierStandard', 'APITierPremium' + Category APITier `json:"category,omitempty"` +} + +// MarshalJSON is the custom marshaler for IntegrationServiceEnvironmentManagedAPIProperties. +func (isemap IntegrationServiceEnvironmentManagedAPIProperties) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if isemap.DeploymentParameters != nil { + objectMap["deploymentParameters"] = isemap.DeploymentParameters + } + if isemap.IntegrationServiceEnvironment != nil { + objectMap["integrationServiceEnvironment"] = isemap.IntegrationServiceEnvironment + } + return json.Marshal(objectMap) +} + // IntegrationServiceEnvironmentManagedApisDeleteFuture an abstraction for monitoring and retrieving the // results of a long-running operation. type IntegrationServiceEnvironmentManagedApisDeleteFuture struct { @@ -3716,7 +4009,7 @@ type IntegrationServiceEnvironmentManagedApisPutFuture struct { azure.FutureAPI // Result returns the result of the asynchronous operation. // If the operation has not completed it will return an error. - Result func(IntegrationServiceEnvironmentManagedApisClient) (ManagedAPI, error) + Result func(IntegrationServiceEnvironmentManagedApisClient) (IntegrationServiceEnvironmentManagedAPI, error) } // UnmarshalJSON is the custom unmarshaller for CreateFuture. @@ -3731,7 +4024,7 @@ func (future *IntegrationServiceEnvironmentManagedApisPutFuture) UnmarshalJSON(b } // result is the default implementation for IntegrationServiceEnvironmentManagedApisPutFuture.Result. -func (future *IntegrationServiceEnvironmentManagedApisPutFuture) result(client IntegrationServiceEnvironmentManagedApisClient) (ma ManagedAPI, err error) { +func (future *IntegrationServiceEnvironmentManagedApisPutFuture) result(client IntegrationServiceEnvironmentManagedApisClient) (isema IntegrationServiceEnvironmentManagedAPI, err error) { var done bool done, err = future.DoneWithContext(context.Background(), client) if err != nil { @@ -3739,15 +4032,15 @@ func (future *IntegrationServiceEnvironmentManagedApisPutFuture) result(client I return } if !done { - ma.Response.Response = future.Response() + isema.Response.Response = future.Response() err = azure.NewAsyncOpIncompleteError("logic.IntegrationServiceEnvironmentManagedApisPutFuture") return } sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if ma.Response.Response, err = future.GetResult(sender); err == nil && ma.Response.Response.StatusCode != http.StatusNoContent { - ma, err = client.PutResponder(ma.Response.Response) + if isema.Response.Response, err = future.GetResult(sender); err == nil && isema.Response.Response.StatusCode != http.StatusNoContent { + isema, err = client.PutResponder(isema.Response.Response) if err != nil { - err = autorest.NewErrorWithError(err, "logic.IntegrationServiceEnvironmentManagedApisPutFuture", "Result", ma.Response.Response, "Failure responding to request") + err = autorest.NewErrorWithError(err, "logic.IntegrationServiceEnvironmentManagedApisPutFuture", "Result", isema.Response.Response, "Failure responding to request") } } return @@ -3857,7 +4150,7 @@ type IntegrationServiceEnvironmentSkuCapacity struct { Maximum *int32 `json:"maximum,omitempty"` // Default - The default capacity. Default *int32 `json:"default,omitempty"` - // ScaleType - The sku scale type. Possible values include: 'Manual', 'Automatic', 'None' + // ScaleType - The sku scale type. Possible values include: 'IntegrationServiceEnvironmentSkuScaleTypeManual', 'IntegrationServiceEnvironmentSkuScaleTypeAutomatic', 'IntegrationServiceEnvironmentSkuScaleTypeNone' ScaleType IntegrationServiceEnvironmentSkuScaleType `json:"scaleType,omitempty"` } @@ -4200,7 +4493,6 @@ type ListKeyVaultKeysDefinition struct { // ManagedAPI the managed api definition. type ManagedAPI struct { - autorest.Response `json:"-"` // Properties - The api resource properties. Properties *APIResourceProperties `json:"properties,omitempty"` // ID - READ-ONLY; The resource id. @@ -4232,161 +4524,34 @@ func (ma ManagedAPI) MarshalJSON() ([]byte, error) { // ManagedAPIListResult the list of managed APIs. type ManagedAPIListResult struct { - autorest.Response `json:"-"` // Value - The managed APIs. Value *[]ManagedAPI `json:"value,omitempty"` // NextLink - The URL to get the next set of results. NextLink *string `json:"nextLink,omitempty"` } -// ManagedAPIListResultIterator provides access to a complete listing of ManagedAPI values. -type ManagedAPIListResultIterator struct { - i int - page ManagedAPIListResultPage -} - -// NextWithContext advances to the next value. If there was an error making -// the request the iterator does not advance and the error is returned. -func (iter *ManagedAPIListResultIterator) NextWithContext(ctx context.Context) (err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/ManagedAPIListResultIterator.NextWithContext") - defer func() { - sc := -1 - if iter.Response().Response.Response != nil { - sc = iter.Response().Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - iter.i++ - if iter.i < len(iter.page.Values()) { - return nil - } - err = iter.page.NextWithContext(ctx) - if err != nil { - iter.i-- - return err - } - iter.i = 0 - return nil -} - -// Next advances to the next value. If there was an error making -// the request the iterator does not advance and the error is returned. -// Deprecated: Use NextWithContext() instead. -func (iter *ManagedAPIListResultIterator) Next() error { - return iter.NextWithContext(context.Background()) -} - -// NotDone returns true if the enumeration should be started or is not yet complete. -func (iter ManagedAPIListResultIterator) NotDone() bool { - return iter.page.NotDone() && iter.i < len(iter.page.Values()) -} - -// Response returns the raw server response from the last page request. -func (iter ManagedAPIListResultIterator) Response() ManagedAPIListResult { - return iter.page.Response() -} - -// Value returns the current value or a zero-initialized value if the -// iterator has advanced beyond the end of the collection. -func (iter ManagedAPIListResultIterator) Value() ManagedAPI { - if !iter.page.NotDone() { - return ManagedAPI{} - } - return iter.page.Values()[iter.i] -} - -// Creates a new instance of the ManagedAPIListResultIterator type. -func NewManagedAPIListResultIterator(page ManagedAPIListResultPage) ManagedAPIListResultIterator { - return ManagedAPIListResultIterator{page: page} -} - -// IsEmpty returns true if the ListResult contains no values. -func (malr ManagedAPIListResult) IsEmpty() bool { - return malr.Value == nil || len(*malr.Value) == 0 -} - -// hasNextLink returns true if the NextLink is not empty. -func (malr ManagedAPIListResult) hasNextLink() bool { - return malr.NextLink != nil && len(*malr.NextLink) != 0 -} - -// managedAPIListResultPreparer prepares a request to retrieve the next set of results. -// It returns nil if no more results exist. -func (malr ManagedAPIListResult) managedAPIListResultPreparer(ctx context.Context) (*http.Request, error) { - if !malr.hasNextLink() { - return nil, nil - } - return autorest.Prepare((&http.Request{}).WithContext(ctx), - autorest.AsJSON(), - autorest.AsGet(), - autorest.WithBaseURL(to.String(malr.NextLink))) -} - -// ManagedAPIListResultPage contains a page of ManagedAPI values. -type ManagedAPIListResultPage struct { - fn func(context.Context, ManagedAPIListResult) (ManagedAPIListResult, error) - malr ManagedAPIListResult +// ManagedServiceIdentity managed service identity properties. +type ManagedServiceIdentity struct { + // Type - Type of managed service identity. The type 'SystemAssigned' includes an implicitly created identity. The type 'None' will remove any identities from the resource. Possible values include: 'ManagedServiceIdentityTypeSystemAssigned', 'ManagedServiceIdentityTypeUserAssigned', 'ManagedServiceIdentityTypeNone' + Type ManagedServiceIdentityType `json:"type,omitempty"` + // TenantID - READ-ONLY; Tenant of managed service identity. + TenantID *uuid.UUID `json:"tenantId,omitempty"` + // PrincipalID - READ-ONLY; Principal Id of managed service identity. + PrincipalID *uuid.UUID `json:"principalId,omitempty"` + // UserAssignedIdentities - The list of user assigned identities associated with the resource. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName} + UserAssignedIdentities map[string]*UserAssignedIdentity `json:"userAssignedIdentities"` } -// NextWithContext advances to the next page of values. If there was an error making -// the request the page does not advance and the error is returned. -func (page *ManagedAPIListResultPage) NextWithContext(ctx context.Context) (err error) { - if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/ManagedAPIListResultPage.NextWithContext") - defer func() { - sc := -1 - if page.Response().Response.Response != nil { - sc = page.Response().Response.Response.StatusCode - } - tracing.EndSpan(ctx, sc, err) - }() - } - for { - next, err := page.fn(ctx, page.malr) - if err != nil { - return err - } - page.malr = next - if !next.hasNextLink() || !next.IsEmpty() { - break - } - } - return nil -} - -// Next advances to the next page of values. If there was an error making -// the request the page does not advance and the error is returned. -// Deprecated: Use NextWithContext() instead. -func (page *ManagedAPIListResultPage) Next() error { - return page.NextWithContext(context.Background()) -} - -// NotDone returns true if the page enumeration should be started or is not yet complete. -func (page ManagedAPIListResultPage) NotDone() bool { - return !page.malr.IsEmpty() -} - -// Response returns the raw server response from the last page request. -func (page ManagedAPIListResultPage) Response() ManagedAPIListResult { - return page.malr -} - -// Values returns the slice of values for the current page or nil if there are no values. -func (page ManagedAPIListResultPage) Values() []ManagedAPI { - if page.malr.IsEmpty() { - return nil +// MarshalJSON is the custom marshaler for ManagedServiceIdentity. +func (msi ManagedServiceIdentity) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if msi.Type != "" { + objectMap["type"] = msi.Type } - return *page.malr.Value -} - -// Creates a new instance of the ManagedAPIListResultPage type. -func NewManagedAPIListResultPage(cur ManagedAPIListResult, getNextPage func(context.Context, ManagedAPIListResult) (ManagedAPIListResult, error)) ManagedAPIListResultPage { - return ManagedAPIListResultPage{ - fn: getNextPage, - malr: cur, + if msi.UserAssignedIdentities != nil { + objectMap["userAssignedIdentities"] = msi.UserAssignedIdentities } + return json.Marshal(objectMap) } // NetworkConfiguration the network configuration. @@ -4416,21 +4581,12 @@ func (oaap OpenAuthenticationAccessPolicies) MarshalJSON() ([]byte, error) { // OpenAuthenticationAccessPolicy open authentication access policy defined by user. type OpenAuthenticationAccessPolicy struct { - // Type - READ-ONLY; Type of provider for OAuth. Possible values include: 'AAD' + // Type - Type of provider for OAuth. Possible values include: 'OpenAuthenticationProviderTypeAAD' Type OpenAuthenticationProviderType `json:"type,omitempty"` // Claims - The access policy claims. Claims *[]OpenAuthenticationPolicyClaim `json:"claims,omitempty"` } -// MarshalJSON is the custom marshaler for OpenAuthenticationAccessPolicy. -func (oaap OpenAuthenticationAccessPolicy) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]interface{}) - if oaap.Claims != nil { - objectMap["claims"] = oaap.Claims - } - return json.Marshal(objectMap) -} - // OpenAuthenticationPolicyClaim open authentication policy claim. type OpenAuthenticationPolicyClaim struct { // Name - The name of the claim. @@ -4720,7 +4876,7 @@ type RecurrenceSchedule struct { // RecurrenceScheduleOccurrence the recurrence schedule occurrence. type RecurrenceScheduleOccurrence struct { - // Day - The day of the week. Possible values include: 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday' + // Day - The day of the week. Possible values include: 'DayOfWeekSunday', 'DayOfWeekMonday', 'DayOfWeekTuesday', 'DayOfWeekWednesday', 'DayOfWeekThursday', 'DayOfWeekFriday', 'DayOfWeekSaturday' Day DayOfWeek `json:"day,omitempty"` // Occurrence - The occurrence. Occurrence *int32 `json:"occurrence,omitempty"` @@ -5287,7 +5443,7 @@ func (sed SwaggerExternalDocumentation) MarshalJSON() ([]byte, error) { type SwaggerSchema struct { // Ref - The reference. Ref *string `json:"ref,omitempty"` - // Type - The type. Possible values include: 'String', 'Number', 'Integer', 'Boolean', 'Array', 'File', 'Object', 'Null' + // Type - The type. Possible values include: 'SwaggerSchemaTypeString', 'SwaggerSchemaTypeNumber', 'SwaggerSchemaTypeInteger', 'SwaggerSchemaTypeBoolean', 'SwaggerSchemaTypeArray', 'SwaggerSchemaTypeFile', 'SwaggerSchemaTypeObject', 'SwaggerSchemaTypeNull' Type SwaggerSchemaType `json:"type,omitempty"` // Title - The title. Title *string `json:"title,omitempty"` @@ -5435,7 +5591,7 @@ func (sx SwaggerXML) MarshalJSON() ([]byte, error) { // TrackingEvent the tracking event. type TrackingEvent struct { - // EventLevel - The event level. Possible values include: 'LogAlways', 'Critical', 'Error', 'Warning', 'Informational', 'Verbose' + // EventLevel - The event level. Possible values include: 'EventLevelLogAlways', 'EventLevelCritical', 'EventLevelError', 'EventLevelWarning', 'EventLevelInformational', 'EventLevelVerbose' EventLevel EventLevel `json:"eventLevel,omitempty"` // EventTime - The event time. EventTime *date.Time `json:"eventTime,omitempty"` @@ -5465,11 +5621,26 @@ type TrackingEventsDefinition struct { Events *[]TrackingEvent `json:"events,omitempty"` } +// UserAssignedIdentity user Assigned identity properties. +type UserAssignedIdentity struct { + // PrincipalID - READ-ONLY; Principal Id of user assigned identity + PrincipalID *string `json:"principalId,omitempty"` + // ClientID - READ-ONLY; Client Id of user assigned identity + ClientID *string `json:"clientId,omitempty"` +} + +// MarshalJSON is the custom marshaler for UserAssignedIdentity. +func (uai UserAssignedIdentity) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + return json.Marshal(objectMap) +} + // Workflow the workflow type. type Workflow struct { autorest.Response `json:"-"` // WorkflowProperties - The workflow properties. *WorkflowProperties `json:"properties,omitempty"` + Identity *ManagedServiceIdentity `json:"identity,omitempty"` // ID - READ-ONLY; The resource id. ID *string `json:"id,omitempty"` // Name - READ-ONLY; Gets the resource name. @@ -5488,6 +5659,9 @@ func (w Workflow) MarshalJSON() ([]byte, error) { if w.WorkflowProperties != nil { objectMap["properties"] = w.WorkflowProperties } + if w.Identity != nil { + objectMap["identity"] = w.Identity + } if w.Location != nil { objectMap["location"] = w.Location } @@ -5515,6 +5689,15 @@ func (w *Workflow) UnmarshalJSON(body []byte) error { } w.WorkflowProperties = &workflowProperties } + case "identity": + if v != nil { + var identity ManagedServiceIdentity + err = json.Unmarshal(*v, &identity) + if err != nil { + return err + } + w.Identity = &identity + } case "id": if v != nil { var ID string diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2021-06-01/postgresqlflexibleservers/_meta.json b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2021-06-01/postgresqlflexibleservers/_meta.json index 23514e48e01d..24a154087ca0 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2021-06-01/postgresqlflexibleservers/_meta.json +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2021-06-01/postgresqlflexibleservers/_meta.json @@ -1,5 +1,5 @@ { - "commit": "6e95cd4c6086d61bb3de67cf6e4209a7b84efa23", + "commit": "daf57304e06ef0369f7d5d8104ae03ae78d13ca9", "readme": "/_/azure-rest-api-specs/specification/postgresql/resource-manager/readme.md", "tag": "package-flexibleserver-2021-06", "use": "@microsoft.azure/autorest.go@2.1.187", diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/containerregistry/mgmt/2020-11-01-preview/containerregistry/CHANGELOG.md b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/containerregistry/mgmt/2020-11-01-preview/containerregistry/CHANGELOG.md index 52911e4cc5e4..0712386d8839 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/containerregistry/mgmt/2020-11-01-preview/containerregistry/CHANGELOG.md +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/containerregistry/mgmt/2020-11-01-preview/containerregistry/CHANGELOG.md @@ -1,2 +1,27 @@ # Change History +## Breaking Changes + +### Struct Changes + +#### Removed Structs + +1. StorageAccountProperties + +#### Removed Struct Fields + +1. RegistryProperties.StorageAccount + +## Additive Changes + +### Struct Changes + +#### New Structs + +1. OperationLogSpecificationDefinition + +#### New Struct Fields + +1. OperationServiceSpecificationDefinition.LogSpecifications +1. RegistryProperties.AnonymousPullEnabled +1. RegistryPropertiesUpdateParameters.AnonymousPullEnabled diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/containerregistry/mgmt/2020-11-01-preview/containerregistry/_meta.json b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/containerregistry/mgmt/2020-11-01-preview/containerregistry/_meta.json index cbc4bca8cef5..c4fdc43985bb 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/containerregistry/mgmt/2020-11-01-preview/containerregistry/_meta.json +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/containerregistry/mgmt/2020-11-01-preview/containerregistry/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "769e09cac92c50b1f9fa6468775b7cb7de16bb06", "readme": "/_/azure-rest-api-specs/specification/containerregistry/resource-manager/readme.md", "tag": "package-2020-11-preview", "use": "@microsoft.azure/autorest.go@2.1.187", diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/containerregistry/mgmt/2020-11-01-preview/containerregistry/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/containerregistry/mgmt/2020-11-01-preview/containerregistry/models.go index 9b628495e992..5bbd67e27655 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/containerregistry/mgmt/2020-11-01-preview/containerregistry/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/containerregistry/mgmt/2020-11-01-preview/containerregistry/models.go @@ -3442,6 +3442,16 @@ func NewOperationListResultPage(cur OperationListResult, getNextPage func(contex } } +// OperationLogSpecificationDefinition the definition of Azure Monitoring log. +type OperationLogSpecificationDefinition struct { + // Name - Log name. + Name *string `json:"name,omitempty"` + // DisplayName - Log display name. + DisplayName *string `json:"displayName,omitempty"` + // BlobDuration - Log blob duration. + BlobDuration *string `json:"blobDuration,omitempty"` +} + // OperationMetricSpecificationDefinition the definition of Azure Monitoring metric. type OperationMetricSpecificationDefinition struct { // Name - Metric name. @@ -3468,6 +3478,8 @@ type OperationPropertiesDefinition struct { type OperationServiceSpecificationDefinition struct { // MetricSpecifications - A list of Azure Monitoring metrics definition. MetricSpecifications *[]OperationMetricSpecificationDefinition `json:"metricSpecifications,omitempty"` + // LogSpecifications - A list of Azure Monitoring log definitions. + LogSpecifications *[]OperationLogSpecificationDefinition `json:"logSpecifications,omitempty"` } // OverrideTaskStepProperties ... @@ -5196,8 +5208,6 @@ type RegistryProperties struct { Status *Status `json:"status,omitempty"` // AdminUserEnabled - The value that indicates whether the admin user is enabled. AdminUserEnabled *bool `json:"adminUserEnabled,omitempty"` - // StorageAccount - The properties of the storage account for the container registry. Only applicable to Classic SKU. - StorageAccount *StorageAccountProperties `json:"storageAccount,omitempty"` // NetworkRuleSet - The network rule set for a container registry. NetworkRuleSet *NetworkRuleSet `json:"networkRuleSet,omitempty"` // Policies - The policies for a container registry. @@ -5216,6 +5226,8 @@ type RegistryProperties struct { NetworkRuleBypassOptions NetworkRuleBypassOptions `json:"networkRuleBypassOptions,omitempty"` // ZoneRedundancy - Whether or not zone redundancy is enabled for this container registry. Possible values include: 'ZoneRedundancyEnabled', 'ZoneRedundancyDisabled' ZoneRedundancy ZoneRedundancy `json:"zoneRedundancy,omitempty"` + // AnonymousPullEnabled - Enables registry-wide pull from unauthenticated clients. + AnonymousPullEnabled *bool `json:"anonymousPullEnabled,omitempty"` } // MarshalJSON is the custom marshaler for RegistryProperties. @@ -5224,9 +5236,6 @@ func (rp RegistryProperties) MarshalJSON() ([]byte, error) { if rp.AdminUserEnabled != nil { objectMap["adminUserEnabled"] = rp.AdminUserEnabled } - if rp.StorageAccount != nil { - objectMap["storageAccount"] = rp.StorageAccount - } if rp.NetworkRuleSet != nil { objectMap["networkRuleSet"] = rp.NetworkRuleSet } @@ -5248,6 +5257,9 @@ func (rp RegistryProperties) MarshalJSON() ([]byte, error) { if rp.ZoneRedundancy != "" { objectMap["zoneRedundancy"] = rp.ZoneRedundancy } + if rp.AnonymousPullEnabled != nil { + objectMap["anonymousPullEnabled"] = rp.AnonymousPullEnabled + } return json.Marshal(objectMap) } @@ -5267,16 +5279,18 @@ type RegistryPropertiesUpdateParameters struct { PublicNetworkAccess PublicNetworkAccess `json:"publicNetworkAccess,omitempty"` // NetworkRuleBypassOptions - Whether to allow trusted Azure services to access a network restricted registry. Possible values include: 'NetworkRuleBypassOptionsAzureServices', 'NetworkRuleBypassOptionsNone' NetworkRuleBypassOptions NetworkRuleBypassOptions `json:"networkRuleBypassOptions,omitempty"` + // AnonymousPullEnabled - Enables registry-wide pull from unauthenticated clients. + AnonymousPullEnabled *bool `json:"anonymousPullEnabled,omitempty"` } // RegistryUpdateParameters the parameters for updating a container registry. type RegistryUpdateParameters struct { + // Identity - The identity of the container registry. + Identity *IdentityProperties `json:"identity,omitempty"` // Tags - The tags for the container registry. Tags map[string]*string `json:"tags"` // Sku - The SKU of the container registry. Sku *Sku `json:"sku,omitempty"` - // Identity - The identity of the container registry. - Identity *IdentityProperties `json:"identity,omitempty"` // RegistryPropertiesUpdateParameters - The properties that the container registry will be updated with. *RegistryPropertiesUpdateParameters `json:"properties,omitempty"` } @@ -5284,15 +5298,15 @@ type RegistryUpdateParameters struct { // MarshalJSON is the custom marshaler for RegistryUpdateParameters. func (rup RegistryUpdateParameters) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) + if rup.Identity != nil { + objectMap["identity"] = rup.Identity + } if rup.Tags != nil { objectMap["tags"] = rup.Tags } if rup.Sku != nil { objectMap["sku"] = rup.Sku } - if rup.Identity != nil { - objectMap["identity"] = rup.Identity - } if rup.RegistryPropertiesUpdateParameters != nil { objectMap["properties"] = rup.RegistryPropertiesUpdateParameters } @@ -5308,6 +5322,15 @@ func (rup *RegistryUpdateParameters) UnmarshalJSON(body []byte) error { } for k, v := range m { switch k { + case "identity": + if v != nil { + var identity IdentityProperties + err = json.Unmarshal(*v, &identity) + if err != nil { + return err + } + rup.Identity = &identity + } case "tags": if v != nil { var tags map[string]*string @@ -5326,15 +5349,6 @@ func (rup *RegistryUpdateParameters) UnmarshalJSON(body []byte) error { } rup.Sku = &sku } - case "identity": - if v != nil { - var identity IdentityProperties - err = json.Unmarshal(*v, &identity) - if err != nil { - return err - } - rup.Identity = &identity - } case "properties": if v != nil { var registryPropertiesUpdateParameters RegistryPropertiesUpdateParameters @@ -7113,13 +7127,6 @@ func (sdp StatusDetailProperties) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// StorageAccountProperties the properties of a storage account for a container registry. Only applicable -// to Classic SKU. -type StorageAccountProperties struct { - // ID - The resource ID of the storage account. - ID *string `json:"id,omitempty"` -} - // SyncProperties the sync properties of the connected registry with its parent. type SyncProperties struct { // TokenID - The resource ID of the ACR token used to authenticate the connected registry to its parent during sync. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/containerregistry/mgmt/2020-11-01-preview/containerregistry/registries.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/containerregistry/mgmt/2020-11-01-preview/containerregistry/registries.go index 8c74c83a497b..9545b6f84de4 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/containerregistry/mgmt/2020-11-01-preview/containerregistry/registries.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/containerregistry/mgmt/2020-11-01-preview/containerregistry/registries.go @@ -142,11 +142,7 @@ func (client RegistriesClient) Create(ctx context.Context, resourceGroupName str {Target: "registryName", Name: validation.MinLength, Rule: 5, Chain: nil}, {Target: "registryName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9]*$`, Chain: nil}}}, {TargetValue: registry, - Constraints: []validation.Constraint{{Target: "registry.Sku", Name: validation.Null, Rule: true, Chain: nil}, - {Target: "registry.RegistryProperties", Name: validation.Null, Rule: false, - Chain: []validation.Constraint{{Target: "registry.RegistryProperties.StorageAccount", Name: validation.Null, Rule: false, - Chain: []validation.Constraint{{Target: "registry.RegistryProperties.StorageAccount.ID", Name: validation.Null, Rule: true, Chain: nil}}}, - }}}}}); err != nil { + Constraints: []validation.Constraint{{Target: "registry.Sku", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil { return result, validation.NewError("containerregistry.RegistriesClient", "Create", err.Error()) } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/version/version.go b/vendor/github.com/Azure/azure-sdk-for-go/version/version.go index 2bb011797a93..d6b7e3819664 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/version/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/version/version.go @@ -4,4 +4,4 @@ package version // Licensed under the MIT License. See License.txt in the project root for license information. // Number contains the semantic version of this SDK. -const Number = "v58.0.0" +const Number = "v59.0.0" diff --git a/vendor/modules.txt b/vendor/modules.txt index 2e4e07704846..271597ed2f75 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -9,7 +9,7 @@ cloud.google.com/go/internal/version # cloud.google.com/go/storage v1.16.0 ## explicit cloud.google.com/go/storage -# github.com/Azure/azure-sdk-for-go v58.0.0+incompatible +# github.com/Azure/azure-sdk-for-go v59.0.0+incompatible ## explicit github.com/Azure/azure-sdk-for-go/profiles/2017-03-09/resources/mgmt/resources github.com/Azure/azure-sdk-for-go/services/aad/mgmt/2017-04-01/aad diff --git a/website/docs/d/container_registry.html.markdown b/website/docs/d/container_registry.html.markdown index b222f3794dd9..df4f7ca91551 100644 --- a/website/docs/d/container_registry.html.markdown +++ b/website/docs/d/container_registry.html.markdown @@ -47,8 +47,6 @@ The following attributes are exported: * `sku` - The SKU of this Container Registry, such as `Basic`. -* `storage_account_id` - The ID of the Storage Account used for this Container Registry. This is only returned for `Classic` SKU's. - * `tags` - A map of tags assigned to the Container Registry. ## Timeouts diff --git a/website/docs/r/container_registry.html.markdown b/website/docs/r/container_registry.html.markdown index 0aba01365433..32c26f9cdf50 100644 --- a/website/docs/r/container_registry.html.markdown +++ b/website/docs/r/container_registry.html.markdown @@ -99,8 +99,6 @@ The following arguments are supported: * `admin_enabled` - (Optional) Specifies whether the admin user is enabled. Defaults to `false`. -* `storage_account_id` - (Required for `Classic` Sku - Forbidden otherwise) The ID of a Storage Account which must be located in the same Azure Region as the Container Registry. Changing this forces a new resource to be created. - * `sku` - (Optional) The SKU name of the container registry. Possible values are `Basic`, `Standard` and `Premium`. `Classic` (which was previously `Basic`) is supported only for existing resources. ~> **NOTE:** The `Classic` SKU is Deprecated and will no longer be available for new resources from the end of March 2019. From f290441d902fcf94427292999bfa5d5850e33f4d Mon Sep 17 00:00:00 2001 From: magodo Date: Fri, 29 Oct 2021 09:15:36 +0800 Subject: [PATCH 2/4] go mod tidy --- go.sum | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.sum b/go.sum index 48d12e3632b3..f532f616f348 100644 --- a/go.sum +++ b/go.sum @@ -45,8 +45,6 @@ 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= From 9c9c4cb31137c8704c83030e4f5c4f7764dc5121 Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 2 Nov 2021 15:57:39 -0700 Subject: [PATCH 3/4] Update internal/services/containers/container_registry_data_source.go --- internal/services/containers/container_registry_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/services/containers/container_registry_data_source.go b/internal/services/containers/container_registry_data_source.go index 76c876b3a165..d27edd61fd7b 100644 --- a/internal/services/containers/container_registry_data_source.go +++ b/internal/services/containers/container_registry_data_source.go @@ -61,7 +61,7 @@ func dataSourceContainerRegistry() *pluginsdk.Resource { "storage_account_id": { Type: pluginsdk.TypeString, Computed: true, - Deprecated: "this attribute is not functional at all, will be removed in v3.0", + 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(), From 7ada58c9c88e2b665697f88c64a03d740ebdac2d Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 2 Nov 2021 15:58:15 -0700 Subject: [PATCH 4/4] Update internal/services/containers/container_registry_resource.go --- internal/services/containers/container_registry_resource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/services/containers/container_registry_resource.go b/internal/services/containers/container_registry_resource.go index 8badbac442a0..2f3d4350b9eb 100644 --- a/internal/services/containers/container_registry_resource.go +++ b/internal/services/containers/container_registry_resource.go @@ -142,7 +142,7 @@ func resourceContainerRegistry() *pluginsdk.Resource { Optional: true, Computed: true, ForceNew: true, - Deprecated: "this property is not functional at all, will remove in v3.0", + Deprecated: "this attribute is no longer recognized by the API and is not functional anymore, thus this property will be removed in v3.0", }, "login_server": {